Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Atrium/Http/Controllers/RedirectDomainUiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use LogicException;
use RefactorCircus\Cortex\Atrium\Http\Controllers\Concerns\AuthorizesScreens;
use RefactorCircus\Cortex\Domains\RedirectDomain\Actions\CreateRedirectDomainAction;
use RefactorCircus\Cortex\Domains\RedirectDomain\Actions\DeleteRedirectDomainAction;
Expand All @@ -17,6 +16,7 @@
use RefactorCircus\Cortex\Domains\RedirectDomain\Data\ListRedirectDomainsData;
use RefactorCircus\Cortex\Domains\RedirectDomain\Models\RedirectDomainModel;
use RefactorCircus\Cortex\Domains\RedirectDomain\Services\RedirectDomains;
use RefactorCircus\Cortex\Exceptions\UnexpectedResultException;

/**
* Every stored redirect domain, whoever owns it. Domains added here belong
Expand Down Expand Up @@ -121,7 +121,7 @@ private function stored(?string $source, Request $request): LengthAwarePaginator
page: is_numeric($page) ? max(1, (int) $page) : null,
));

return $stored instanceof LengthAwarePaginator ? $stored->withQueryString() : throw new LogicException('A paged listing answers a page.');
return $stored instanceof LengthAwarePaginator ? $stored->withQueryString() : throw UnexpectedResultException::pagedListing();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideModel;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideVersionModel;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;

final class CreateConcreteAgentVersionAction
final class CreateConcreteAgentVersionAction extends Action
{
public function __construct(private readonly PublicationCache $cache) {}

public function execute(string $agent, CreateConcreteAgentVersionData $data): ConcreteAgentOverrideVersionModel
protected function handle(string $agent, CreateConcreteAgentVersionData $data): ConcreteAgentOverrideVersionModel
{
ConcreteAgentVersionCreatingActionEvent::dispatch($agent, $data);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Events\ConcreteAgentOverrideDeletingActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideModel;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;

final class DeleteConcreteAgentOverrideAction
final class DeleteConcreteAgentOverrideAction extends Action
{
public function __construct(private readonly PublicationCache $cache) {}

public function execute(ConcreteAgentOverrideModel $override): void
protected function handle(ConcreteAgentOverrideModel $override): void
{
ConcreteAgentOverrideDeletingActionEvent::dispatch($override);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Events\ConcreteAgentVersionsListingActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideModel;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideVersionModel;
use RefactorCircus\Keystone\Actions\Action;

final class ListConcreteAgentVersionsAction
final class ListConcreteAgentVersionsAction extends Action
{
/**
* @return Collection<int, ConcreteAgentOverrideVersionModel>
*/
public function execute(ConcreteAgentOverrideModel $override): Collection
protected function handle(ConcreteAgentOverrideModel $override): Collection
{
ConcreteAgentVersionsListingActionEvent::dispatch($override);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Events\ConcreteAgentsListingActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideModel;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Services\AgentRegistry;
use RefactorCircus\Keystone\Actions\Action;

final class ListConcreteAgentsAction
final class ListConcreteAgentsAction extends Action
{
public function __construct(private readonly AgentRegistry $registry) {}

/**
* @return list<array{name: string, class: class-string<Agent>, overridable: bool, tools_overridable: bool, instructions: string, tools: list<string>, default_tools: list<string>, override: ConcreteAgentOverrideModel|null}>
*/
public function execute(): array
protected function handle(): array
{
ConcreteAgentsListingActionEvent::dispatch();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideModel;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideVersionModel;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;

final class PublishConcreteAgentVersionAction
final class PublishConcreteAgentVersionAction extends Action
{
public function __construct(private readonly PublicationCache $cache) {}

public function execute(ConcreteAgentOverrideModel $override, int $version): ConcreteAgentOverrideModel
protected function handle(ConcreteAgentOverrideModel $override, int $version): ConcreteAgentOverrideModel
{
ConcreteAgentVersionPublishingActionEvent::dispatch($override, $version);

Expand Down
5 changes: 3 additions & 2 deletions src/Domains/ConcreteAgent/Actions/RunConcreteAgentAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Events\ConcreteAgentRanActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Events\ConcreteAgentRunningActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Services\AgentRegistry;
use RefactorCircus\Keystone\Actions\Action;

final class RunConcreteAgentAction
final class RunConcreteAgentAction extends Action
{
public function __construct(private readonly AgentRegistry $registry) {}

public function execute(string $agent, RunConcreteAgentData $data): AgentResponse
protected function handle(string $agent, RunConcreteAgentData $data): AgentResponse
{
ConcreteAgentRunningActionEvent::dispatch($agent, $data);

Expand Down
5 changes: 3 additions & 2 deletions src/Domains/ConcreteAgent/Actions/ShowConcreteAgentAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Events\ConcreteAgentShownActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideModel;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Services\AgentRegistry;
use RefactorCircus\Keystone\Actions\Action;

final class ShowConcreteAgentAction
final class ShowConcreteAgentAction extends Action
{
public function __construct(private readonly AgentRegistry $registry) {}

/**
* @return array{name: string, class: class-string<Agent>, overridable: bool, tools_overridable: bool, instructions: string, tools: list<string>, default_instructions: string, default_tools: list<string>, override: ConcreteAgentOverrideModel|null}
*/
public function execute(string $agent): array
protected function handle(string $agent): array
{
ConcreteAgentShowingActionEvent::dispatch($agent);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
use RefactorCircus\Cortex\Domains\ConcreteAgent\Events\ConcreteAgentToolsUpdatingActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Models\ConcreteAgentOverrideModel;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;

final class UpdateConcreteAgentToolsAction
final class UpdateConcreteAgentToolsAction extends Action
{
public function __construct(private readonly PublicationCache $cache) {}

public function execute(string $agent, UpdateConcreteAgentToolsData $data): ConcreteAgentOverrideModel
protected function handle(string $agent, UpdateConcreteAgentToolsData $data): ConcreteAgentOverrideModel
{
ConcreteAgentToolsUpdatingActionEvent::dispatch($agent, $data);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@

namespace RefactorCircus\Cortex\Domains\ConcreteAgent\Exceptions;

use InvalidArgumentException;
use RefactorCircus\Cortex\Exceptions\CortexException;

final class AgentNotFoundException extends InvalidArgumentException
final class AgentNotFoundException extends CortexException
{
protected int $status = 404;

public static function forName(string $name): self
{
return new self("Concrete agent [{$name}] is not registered.");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

declare(strict_types=1);

namespace RefactorCircus\Cortex\Domains\ConcreteAgent\Exceptions;

use RefactorCircus\Cortex\Exceptions\CortexException;

/**
* A class registered as a agent is not one.
*/
final class InvalidAgentClassException extends CortexException
{
public static function forClass(string $class, string $expected): self
{
return new self(sprintf('Agent [%s] must implement %s.', $class, $expected));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
use LogicException;
use RefactorCircus\Cortex\Database\Factories\ConcreteAgentOverrideVersionFactory;
use RefactorCircus\Cortex\Exceptions\ImmutableVersionException;
use RefactorCircus\Cortex\Support\Tables;
use RefactorCircus\Keystone\Models\Concerns\DispatchesModelEvents;

Expand Down Expand Up @@ -46,7 +46,7 @@ public function getTable(): string
protected static function booted(): void
{
self::updating(function (): never {
throw new LogicException('Concrete agent prompt versions are immutable. Create a new version instead.');
throw ImmutableVersionException::for('Concrete agent prompt');
});
}

Expand Down
6 changes: 2 additions & 4 deletions src/Domains/ConcreteAgent/Services/AgentRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

use Illuminate\Contracts\Container\Container;
use Illuminate\Support\Str;
use InvalidArgumentException;
use Laravel\Ai\Contracts\Agent as AgentContract;
use Laravel\Ai\Contracts\HasTools;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Concerns\HasCortexOverrides;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Exceptions\AgentNotFoundException;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Exceptions\InvalidAgentClassException;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Support\Agent;
use RefactorCircus\Cortex\Domains\ConcreteAgent\Support\LockedTools;
use RefactorCircus\Cortex\Domains\Tool\Services\ToolRegistry;
Expand Down Expand Up @@ -55,9 +55,7 @@ public function __construct(
public function register(string $name, string $class): void
{
if (! is_a($class, AgentContract::class, true)) {
throw new InvalidArgumentException(
sprintf('Agent [%s] must implement %s.', $class, AgentContract::class),
);
throw InvalidAgentClassException::forClass($class, AgentContract::class);
}

$this->loadConfigAgents();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionModel;
use RefactorCircus\Cortex\Domains\ConcreteServer\Services\McpServerRegistry;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;
use Throwable;

/**
Expand All @@ -21,14 +22,14 @@
* the override row goes only when it holds nothing else. Clearing a server
* without a tool override does nothing.
*/
final class ClearConcreteServerToolsAction
final class ClearConcreteServerToolsAction extends Action
{
public function __construct(
private readonly PublicationCache $cache,
private readonly McpServerRegistry $servers,
) {}

public function execute(string $server, ClearConcreteServerToolsData $data): void
protected function handle(string $server, ClearConcreteServerToolsData $data): void
{
ConcreteServerToolsClearingActionEvent::dispatch($server, $data);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionModel;
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionVersionModel;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;

final class CreateMcpInstructionVersionAction
final class CreateMcpInstructionVersionAction extends Action
{
public function __construct(private readonly PublicationCache $cache) {}

public function execute(string $server, CreateMcpInstructionVersionData $data): McpInstructionVersionModel
protected function handle(string $server, CreateMcpInstructionVersionData $data): McpInstructionVersionModel
{
McpInstructionVersionCreatingActionEvent::dispatch($server, $data);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionModel;
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionVersionModel;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;
use Throwable;

/**
Expand All @@ -22,11 +23,11 @@
* Returns the row when it survives (it still holds a tool override), or null
* when it was removed, so callers can answer with what is left.
*/
final class DeleteMcpInstructionAction
final class DeleteMcpInstructionAction extends Action
{
public function __construct(private readonly PublicationCache $cache) {}

public function execute(McpInstructionModel $instruction): ?McpInstructionModel
protected function handle(McpInstructionModel $instruction): ?McpInstructionModel
{
McpInstructionDeletingActionEvent::dispatch($instruction);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Events\McpInstructionVersionsListingActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionModel;
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionVersionModel;
use RefactorCircus\Keystone\Actions\Action;

final class ListMcpInstructionVersionsAction
final class ListMcpInstructionVersionsAction extends Action
{
/**
* @return Collection<int, McpInstructionVersionModel>
*/
public function execute(McpInstructionModel $instruction): Collection
protected function handle(McpInstructionModel $instruction): Collection
{
McpInstructionVersionsListingActionEvent::dispatch($instruction);

Expand Down
5 changes: 3 additions & 2 deletions src/Domains/ConcreteServer/Actions/ListMcpServersAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Events\McpServersListedActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteServer\Events\McpServersListingActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteServer\Services\McpServerRegistry;
use RefactorCircus\Keystone\Actions\Action;

final class ListMcpServersAction
final class ListMcpServersAction extends Action
{
public function __construct(private readonly McpServerRegistry $registry) {}

/**
* @return list<array{name: string, class: class-string<McpServer>, instructions: string}>
*/
public function execute(): array
protected function handle(): array
{
McpServersListingActionEvent::dispatch();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionModel;
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionVersionModel;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;

final class PublishMcpInstructionVersionAction
final class PublishMcpInstructionVersionAction extends Action
{
public function __construct(private readonly PublicationCache $cache) {}

public function execute(McpInstructionModel $instruction, int $version): McpInstructionModel
protected function handle(McpInstructionModel $instruction, int $version): McpInstructionModel
{
McpInstructionVersionPublishingActionEvent::dispatch($instruction, $version);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Events\McpInstructionShowingActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteServer\Events\McpInstructionShownActionEvent;
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionModel;
use RefactorCircus\Keystone\Actions\Action;

final class ShowMcpInstructionAction
final class ShowMcpInstructionAction extends Action
{
public function execute(string $server): McpInstructionModel
protected function handle(string $server): McpInstructionModel
{
McpInstructionShowingActionEvent::dispatch($server);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,22 @@
use RefactorCircus\Cortex\Domains\ConcreteServer\Models\McpInstructionModel;
use RefactorCircus\Cortex\Domains\ConcreteServer\Services\McpServerRegistry;
use RefactorCircus\Cortex\Support\PublicationCache;
use RefactorCircus\Keystone\Actions\Action;
use Throwable;

/**
* Stores the tool list a concrete MCP server serves instead of its code
* tools, on the server's override row, creating the row when it is missing.
* The `cortex` server's tools cannot be overridden.
*/
final class UpdateConcreteServerToolsAction
final class UpdateConcreteServerToolsAction extends Action
{
public function __construct(
private readonly PublicationCache $cache,
private readonly McpServerRegistry $servers,
) {}

public function execute(string $server, UpdateConcreteServerToolsData $data): McpInstructionModel
protected function handle(string $server, UpdateConcreteServerToolsData $data): McpInstructionModel
{
ConcreteServerToolsUpdatingActionEvent::dispatch($server, $data);

Expand Down
Loading
Loading