+
+
+
+
+ · Enter to send · Esc to cancel
+
+
+
+
+
+
+
diff --git a/resources/views/livewire/server/log-drains.blade.php b/resources/views/livewire/server/log-drains.blade.php
index ac908a7c9d..3f3d756414 100644
--- a/resources/views/livewire/server/log-drains.blade.php
+++ b/resources/views/livewire/server/log-drains.blade.php
@@ -34,7 +34,7 @@
['value' => false, 'label' => 'Disabled'],
['value' => true, 'label' => 'Enabled'],
]"
- :disabled="$isLogDrainAxiomEnabled || $isLogDrainCustomEnabled || !auth()->user()->can('update', $server)" />
+ :disabled="$isLogDrainAxiomEnabled || $isLogDrainCustomEnabled || $isLogDrainCloudwatchEnabled || !auth()->user()->can('update', $server)" />
+
+
+
+
+
@@ -70,7 +93,7 @@
['value' => false, 'label' => 'Disabled'],
['value' => true, 'label' => 'Enabled'],
]"
- :disabled="$isLogDrainNewRelicEnabled || $isLogDrainAxiomEnabled || !auth()->user()->can('update', $server)" />
+ :disabled="$isLogDrainNewRelicEnabled || $isLogDrainAxiomEnabled || $isLogDrainCloudwatchEnabled || !auth()->user()->can('update', $server)" />
diff --git a/tests/Feature/Api/NotificationsApiTest.php b/tests/Feature/Api/NotificationsApiTest.php
index d6bb96d15a..d5f4908ed8 100644
--- a/tests/Feature/Api/NotificationsApiTest.php
+++ b/tests/Feature/Api/NotificationsApiTest.php
@@ -192,6 +192,31 @@ describe('PATCH /api/v1/notifications/*', function () {
->and($settings->deployment_failure_email_notifications)->toBeFalse();
});
+ test('updates the deployment commit details email setting', function () {
+ $this->withHeaders(authHeaders($this->bearerToken))
+ ->getJson('/api/v1/notifications/email')
+ ->assertSuccessful()
+ ->assertJsonPath('deployment_commit_details_email_notifications', false);
+
+ $this->withHeaders(authHeaders($this->bearerToken))
+ ->patchJson('/api/v1/notifications/email', [
+ 'deployment_commit_details_email_notifications' => true,
+ ])
+ ->assertSuccessful()
+ ->assertJsonPath('deployment_commit_details_email_notifications', true);
+
+ expect(EmailNotificationSettings::query()->where('team_id', $this->team->id)->value('deployment_commit_details_email_notifications'))->toBeTruthy();
+ });
+
+ test('validates the deployment commit details email setting', function () {
+ $this->withHeaders(authHeaders($this->bearerToken))
+ ->patchJson('/api/v1/notifications/email', [
+ 'deployment_commit_details_email_notifications' => 'not-a-boolean',
+ ])
+ ->assertUnprocessable()
+ ->assertJsonValidationErrors('deployment_commit_details_email_notifications');
+ });
+
test('validates the smtp ehlo domain', function () {
$this->withHeaders(authHeaders($this->bearerToken))
->patchJson('/api/v1/notifications/email', [
diff --git a/tests/Feature/Api/ServerSubsystemsApiTest.php b/tests/Feature/Api/ServerSubsystemsApiTest.php
index 631ae83241..a131bf22ab 100644
--- a/tests/Feature/Api/ServerSubsystemsApiTest.php
+++ b/tests/Feature/Api/ServerSubsystemsApiTest.php
@@ -240,6 +240,89 @@ describe('Log drains API', function () {
expect($this->server->settings->fresh()->logdrain_custom_config)->toBe("[OUTPUT]\n Name stdout");
});
+ test('PATCH enables the Amazon CloudWatch Logs drain', function () {
+ Queue::fake();
+
+ $this->withHeaders(serverSubsystemsHeaders())
+ ->patchJson("/api/v1/servers/{$this->server->uuid}/log-drains", [
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_group' => '/coolify/prod',
+ 'logdrain_cloudwatch_region' => 'us-east-1',
+ 'logdrain_cloudwatch_stream_prefix' => 'docker/',
+ ])
+ ->assertOk()
+ ->assertJsonPath('is_logdrain_cloudwatch_enabled', true)
+ ->assertJsonPath('logdrain_cloudwatch_group', '/coolify/prod')
+ ->assertJsonPath('logdrain_cloudwatch_stream_prefix', 'docker/');
+
+ $settings = $this->server->settings->fresh();
+ expect($settings->is_logdrain_cloudwatch_enabled)->toBeTrue()
+ ->and($settings->logdrain_cloudwatch_region)->toBe('us-east-1');
+ });
+
+ test('PATCH rejects enabling CloudWatch without a log group', function () {
+ Queue::fake();
+
+ $this->withHeaders(serverSubsystemsHeaders())
+ ->patchJson("/api/v1/servers/{$this->server->uuid}/log-drains", [
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_region' => 'us-east-1',
+ ])
+ ->assertUnprocessable()
+ ->assertJsonValidationErrors('logdrain_cloudwatch_group');
+
+ expect($this->server->settings->fresh()->is_logdrain_cloudwatch_enabled)->toBeFalse();
+ });
+
+ test('PATCH rejects enabling CloudWatch without a region', function () {
+ Queue::fake();
+
+ $this->withHeaders(serverSubsystemsHeaders())
+ ->patchJson("/api/v1/servers/{$this->server->uuid}/log-drains", [
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_group' => 'coolify',
+ ])
+ ->assertUnprocessable()
+ ->assertJsonValidationErrors('logdrain_cloudwatch_region');
+
+ expect($this->server->settings->fresh()->is_logdrain_cloudwatch_enabled)->toBeFalse();
+ });
+
+ test('PATCH rejects CloudWatch values that could break the compose file', function (string $field, mixed $value) {
+ Queue::fake();
+
+ $this->withHeaders(serverSubsystemsHeaders())
+ ->patchJson("/api/v1/servers/{$this->server->uuid}/log-drains", [
+ $field => $value,
+ ])
+ ->assertUnprocessable()
+ ->assertJsonValidationErrors($field);
+ })->with([
+ 'prefix with interpolation' => ['logdrain_cloudwatch_stream_prefix', 'docker/${HOME}'],
+ 'prefix with colon' => ['logdrain_cloudwatch_stream_prefix', 'docker:'],
+ 'prefix with template braces' => ['logdrain_cloudwatch_stream_prefix', '{{.ID}}'],
+ 'invalid region' => ['logdrain_cloudwatch_region', 'not a region'],
+ 'group with spaces' => ['logdrain_cloudwatch_group', 'my group'],
+ ]);
+
+ test('PATCH rejects enabling CloudWatch together with another log drain', function () {
+ Queue::fake();
+ $this->server->settings->update([
+ 'is_logdrain_axiom_enabled' => true,
+ 'logdrain_axiom_dataset_name' => 'ds',
+ 'logdrain_axiom_api_key' => 'key',
+ ]);
+
+ $this->withHeaders(serverSubsystemsHeaders())
+ ->patchJson("/api/v1/servers/{$this->server->uuid}/log-drains", [
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_group' => 'coolify',
+ 'logdrain_cloudwatch_region' => 'us-east-1',
+ ])
+ ->assertUnprocessable()
+ ->assertJsonValidationErrors('is_logdrain_cloudwatch_enabled');
+ });
+
test('other-team log drains endpoints return 404', function () {
$this->withHeaders(serverSubsystemsHeaders())
->getJson("/api/v1/servers/{$this->otherServer->uuid}/log-drains")
diff --git a/tests/Feature/DeploymentEmailCommitDetailsTest.php b/tests/Feature/DeploymentEmailCommitDetailsTest.php
new file mode 100644
index 0000000000..bbba70f796
--- /dev/null
+++ b/tests/Feature/DeploymentEmailCommitDetailsTest.php
@@ -0,0 +1,319 @@
+ 0]);
+
+ $this->team = Team::factory()->create();
+ $server = Server::factory()->create(['team_id' => $this->team->id]);
+ $destination = StandaloneDocker::factory()->create([
+ 'server_id' => $server->id,
+ 'network' => 'commit-details-'.fake()->unique()->word(),
+ ]);
+ $project = Project::factory()->create(['team_id' => $this->team->id]);
+ $environment = Environment::factory()->create(['project_id' => $project->id]);
+
+ $this->application = Application::factory()->create([
+ 'environment_id' => $environment->id,
+ 'destination_id' => $destination->id,
+ 'destination_type' => StandaloneDocker::class,
+ 'git_repository' => 'https://github.com/acme/shop.git',
+ 'git_branch' => 'main',
+ 'fqdn' => 'https://shop.example.com',
+ ]);
+});
+
+function createDeploymentRow(Application $application, array $attributes = []): ApplicationDeploymentQueue
+{
+ return ApplicationDeploymentQueue::create([
+ 'application_id' => $application->id,
+ 'deployment_uuid' => 'deploy-'.fake()->unique()->uuid(),
+ 'commit' => DEPLOYMENT_EMAIL_COMMIT_SHA,
+ 'commit_message' => "Add checkout page\n\nHandles card and wallet payments.",
+ 'status' => 'finished',
+ ...$attributes,
+ ]);
+}
+
+function enableCommitDetails(Team $team, bool $enabled = true): void
+{
+ $team->emailNotificationSettings->update(['deployment_commit_details_email_notifications' => $enabled]);
+ $team->refresh();
+}
+
+function renderDeploymentMail(string $notificationClass, Application $application, ApplicationDeploymentQueue $deployment, Team $team, ?ApplicationPreview $preview = null): string
+{
+ return (string) (new $notificationClass($application, $deployment->deployment_uuid, $preview, $deployment))->toMail($team)->render();
+}
+
+it('defaults the commit details setting to off', function () {
+ expect($this->team->emailNotificationSettings->fresh()->deployment_commit_details_email_notifications)->toBeFalse();
+});
+
+it('includes commit details in deployment emails when enabled', function (string $notificationClass) {
+ enableCommitDetails($this->team);
+ $deployment = createDeploymentRow($this->application);
+
+ $html = renderDeploymentMail($notificationClass, $this->application, $deployment, $this->team);
+
+ expect($html)
+ ->toContain('3f9c2a7')
+ ->toContain('https://github.com/acme/shop/commit/'.DEPLOYMENT_EMAIL_COMMIT_SHA)
+ ->toContain('main')
+ ->toContain('Add checkout page')
+ ->toContain('Handles card and wallet payments.');
+})->with([DeploymentSuccess::class, DeploymentFailed::class]);
+
+it('leaves deployment emails unchanged when the setting is off', function (string $notificationClass) {
+ enableCommitDetails($this->team, false);
+ $deployment = createDeploymentRow($this->application);
+
+ $html = renderDeploymentMail($notificationClass, $this->application, $deployment, $this->team);
+
+ expect($html)
+ ->not->toContain('3f9c2a7')
+ ->not->toContain('Add checkout page')
+ ->toContain('View Deployment Logs');
+})->with([DeploymentSuccess::class, DeploymentFailed::class]);
+
+it('hides the commit block when the deployment has no commit information', function () {
+ enableCommitDetails($this->team);
+ $deployment = createDeploymentRow($this->application, ['commit' => 'HEAD', 'commit_message' => null]);
+
+ $html = renderDeploymentMail(DeploymentSuccess::class, $this->application, $deployment, $this->team);
+
+ expect($html)
+ ->not->toContain('Commit:')
+ ->not->toContain('Commit message:')
+ ->toContain('View Deployment Logs');
+});
+
+it('shows the commit for preview deployments without the base branch', function () {
+ enableCommitDetails($this->team);
+ $preview = ApplicationPreview::create([
+ 'application_id' => $this->application->id,
+ 'pull_request_id' => 42,
+ 'pull_request_html_url' => 'https://github.com/acme/shop/pull/42',
+ 'fqdn' => 'https://pr-42.shop.example.com',
+ ]);
+ $deployment = createDeploymentRow($this->application, ['pull_request_id' => 42]);
+
+ $html = renderDeploymentMail(DeploymentSuccess::class, $this->application, $deployment, $this->team, $preview);
+
+ expect($html)
+ ->toContain('Pull request #42')
+ ->toContain('3f9c2a7')
+ ->toContain('Add checkout page')
+ ->not->toContain(' on main');
+});
+
+it('escapes html and markdown in commit messages', function () {
+ enableCommitDetails($this->team);
+ $deployment = createDeploymentRow($this->application, [
+ 'commit_message' => "Fix bug\n[Verify your account](https://evil.example.com)\n# Big heading",
+ ]);
+
+ $html = renderDeploymentMail(DeploymentSuccess::class, $this->application, $deployment, $this->team);
+
+ expect($html)
+ ->not->toContain('')
+ ->toContain('<script>')
+ ->not->toContain('href="https://evil.example.com"')
+ ->toContain('[Verify your account](https://evil.example.com)')
+ ->not->toContain('',
+ '
',
+ 'click me',
+ '---',
+ 'Co-authored-by: Jane Doe ',
+ 'Emoji check 🚀 ✅',
+ '',
+ str_repeat('Long body sentence for truncation. ', 60),
+ 'THIS_TAIL_SHOULD_BE_TRUNCATED',
+ ]);
+}
+
+it('renders a big markdown commit message as plain safe text', function () {
+ enableCommitDetails($this->team);
+ $deployment = createDeploymentRow($this->application, ['commit_message' => bigMarkdownCommitMessage()]);
+
+ $html = renderDeploymentMail(DeploymentSuccess::class, $this->application, $deployment, $this->team);
+
+ expect($html)
+ ->toContain('feat(checkout): rebuild payment flow')
+ ->toContain('# Heading one')
+ ->toContain('==============')
+ ->toContain('- bullet one')
+ ->toContain('1. first step')
+ ->toContain('```php')
+ ->toContain('| Column A | Column B |')
+ ->toContain('**bold** _italic_ ~~strike~~ `inline code`')
+ ->toContain('Co-authored-by: Jane Doe <jane@example.com>')
+ ->toContain('Emoji check 🚀 ✅')
+ ->not->toContain("\u{FFFD}")
+ ->toContain('Long body sentence for truncation.')
+ ->not->toContain('THIS_TAIL_SHOULD_BE_TRUNCATED')
+ ->not->toContain('href="https://evil.example.com')
+ ->not->toContain('src="https://evil.example.com')
+ ->not->toContain('not->toContain('application, $deployment, $this->team);
+
+ expect($html)
+ ->toContain('Fix caf')
+ ->toContain('menu (latin-1 byte)')
+ ->toContain('View Deployment Logs');
+});
+
+it('builds commit details without querying the deployment queue', function (string $notificationClass) {
+ enableCommitDetails($this->team);
+ $deployment = createDeploymentRow($this->application);
+
+ DB::flushQueryLog();
+ DB::enableQueryLog();
+ $notification = new $notificationClass($this->application, $deployment->deployment_uuid, null, $deployment);
+ $queries = collect(DB::getQueryLog())->pluck('query');
+ DB::disableQueryLog();
+
+ expect($queries->filter(fn (string $query): bool => str_contains($query, 'application_deployment_queues')))->toBeEmpty()
+ ->and($notification->commit_sha)->toBe(DEPLOYMENT_EMAIL_COMMIT_SHA);
+})->with([DeploymentSuccess::class, DeploymentFailed::class]);
+
+it('keeps the old constructor working without a deployment record', function () {
+ enableCommitDetails($this->team);
+
+ $html = (string) (new DeploymentSuccess($this->application, 'legacy-call'))->toMail($this->team)->render();
+
+ expect($html)
+ ->toContain('View Deployment Logs')
+ ->not->toContain('Commit message:');
+});
+
+it('passes the in-memory deployment record from the deployment job', function () {
+ Notification::fake();
+ $this->team->emailNotificationSettings->update(['smtp_enabled' => true, 'deployment_success_email_notifications' => true]);
+ $deployment = createDeploymentRow($this->application);
+ $reflection = new ReflectionClass(ApplicationDeploymentJob::class);
+ $job = $reflection->newInstanceWithoutConstructor();
+ foreach (['application' => $this->application, 'deployment_uuid' => $deployment->deployment_uuid, 'preview' => null, 'application_deployment_queue' => $deployment] as $name => $value) {
+ $reflection->getProperty($name)->setValue($job, $value);
+ }
+
+ $reflection->getMethod('sendDeploymentNotification')->invoke($job, DeploymentSuccess::class);
+
+ Notification::assertSentTo($this->team, DeploymentSuccess::class, fn (DeploymentSuccess $notification) => $notification->commit_sha === DEPLOYMENT_EMAIL_COMMIT_SHA
+ && str_starts_with($notification->commit_message, 'Add checkout page'));
+});
diff --git a/tests/Feature/Helpers/DockerCustomCommandsTest.php b/tests/Feature/Helpers/DockerCustomCommandsTest.php
index cf2408faf3..341e9de31f 100644
--- a/tests/Feature/Helpers/DockerCustomCommandsTest.php
+++ b/tests/Feature/Helpers/DockerCustomCommandsTest.php
@@ -252,3 +252,59 @@ test('ConvertGpusCount', function () {
],
]);
});
+
+test('ConvertInteractiveShortFlag', function () {
+ // -i keeps STDIN open so `docker attach` can send input (e.g. game server consoles).
+ expect(convertDockerRunToCompose('-i'))->toBe([
+ 'stdin_open' => true,
+ ]);
+});
+
+test('ConvertTtyShortFlag', function () {
+ expect(convertDockerRunToCompose('-t'))->toBe([
+ 'tty' => true,
+ ]);
+});
+
+test('ConvertInteractiveTtyCombinedShortFlag', function () {
+ expect(convertDockerRunToCompose('-it'))->toBe([
+ 'stdin_open' => true,
+ 'tty' => true,
+ ]);
+});
+
+test('ConvertTtyInteractiveCombinedShortFlag', function () {
+ expect(convertDockerRunToCompose('-ti'))->toBe([
+ 'stdin_open' => true,
+ 'tty' => true,
+ ]);
+});
+
+test('ConvertInteractiveTtyLongFlags', function () {
+ expect(convertDockerRunToCompose('--interactive --tty'))->toBe([
+ 'stdin_open' => true,
+ 'tty' => true,
+ ]);
+});
+
+test('ConvertInteractiveTtyWithOtherOptions', function () {
+ expect(convertDockerRunToCompose('-it --cap-add SYS_ADMIN'))->toBe([
+ 'cap_add' => ['SYS_ADMIN'],
+ 'stdin_open' => true,
+ 'tty' => true,
+ ]);
+});
+
+test('DoesNotSetInteractiveTtyForUnrelatedShortFlags', function () {
+ // -d (detach) and other short flags without i/t must not enable stdin/tty.
+ expect(convertDockerRunToCompose('-d'))->toBe([]);
+});
+
+it('does not read interactive flags inside entrypoint arguments', function () {
+ expect(convertDockerRunToCompose('--entrypoint "python -i -t script.py"'))
+ ->toBe(['entrypoint' => 'python -i -t script.py']);
+});
+
+it('does not treat arbitrary short words as interactive flags', function () {
+ expect(convertDockerRunToCompose('-invalid'))->toBe([]);
+});
diff --git a/tests/Feature/LogDrain/CloudwatchLogDrainTest.php b/tests/Feature/LogDrain/CloudwatchLogDrainTest.php
new file mode 100644
index 0000000000..26034973b9
--- /dev/null
+++ b/tests/Feature/LogDrain/CloudwatchLogDrainTest.php
@@ -0,0 +1,244 @@
+user = User::factory()->create();
+ $this->team = $this->user->teams()->first();
+ $this->server = Server::factory()->create(['team_id' => $this->team->id]);
+
+ $this->actingAs($this->user);
+ session(['currentTeam' => $this->team]);
+});
+
+it('enables the CloudWatch drain and persists its options', function () {
+ StartLogDrain::mock()->shouldReceive('handle')->once()->andReturn('ok');
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', '/coolify/prod')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->set('logDrainCloudwatchStreamPrefix', 'docker/')
+ ->call('toggleLogDrain', 'cloudwatch')
+ ->assertHasNoErrors()
+ ->assertSet('isLogDrainCloudwatchEnabled', true);
+
+ $settings = $this->server->settings->fresh();
+ expect($settings->is_logdrain_cloudwatch_enabled)->toBeTrue()
+ ->and($settings->logdrain_cloudwatch_group)->toBe('/coolify/prod')
+ ->and($settings->logdrain_cloudwatch_region)->toBe('us-east-1')
+ ->and($settings->logdrain_cloudwatch_stream_prefix)->toBe('docker/');
+});
+
+it('requires a log group before enabling CloudWatch', function () {
+ StartLogDrain::mock()->shouldNotReceive('handle');
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('isLogDrainCloudwatchEnabled', true)
+ ->call('instantSave')
+ ->assertDispatched('error')
+ ->assertSet('isLogDrainCloudwatchEnabled', false);
+
+ expect($this->server->settings->fresh()->is_logdrain_cloudwatch_enabled)->toBeFalse();
+});
+
+it('requires a region before enabling CloudWatch', function () {
+ StartLogDrain::mock()->shouldNotReceive('handle');
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->call('toggleLogDrain', 'cloudwatch')
+ ->assertDispatched('error')
+ ->assertSet('isLogDrainCloudwatchEnabled', false);
+
+ expect($this->server->settings->fresh()->is_logdrain_cloudwatch_enabled)->toBeFalse();
+});
+
+it('rejects stream prefixes that could break the compose file', function (string $prefix) {
+ StartLogDrain::mock()->shouldNotReceive('handle');
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->set('logDrainCloudwatchStreamPrefix', $prefix)
+ ->set('isLogDrainCloudwatchEnabled', true)
+ ->call('instantSave')
+ ->assertDispatched('error')
+ ->assertSet('isLogDrainCloudwatchEnabled', false);
+
+ expect($this->server->settings->fresh()->is_logdrain_cloudwatch_enabled)->toBeFalse();
+})->with(['docker/${HOME}', 'docker:', '{{.ID}}', 'with space']);
+
+it('enables the CloudWatch drain from the status dropdown', function () {
+ StartLogDrain::mock()->shouldReceive('handle')->once()->andReturn('ok');
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->set('logDrainCloudwatchStreamPrefix', 'docker/')
+ ->set('isLogDrainCloudwatchEnabled', true)
+ ->call('instantSave')
+ ->assertDispatched('success');
+
+ $settings = $this->server->settings->fresh();
+ expect($settings->is_logdrain_cloudwatch_enabled)->toBeTrue()
+ ->and($settings->logdrain_cloudwatch_stream_prefix)->toBe('docker/');
+});
+
+it('disables other drains when CloudWatch is enabled', function () {
+ StartLogDrain::mock()->shouldReceive('handle')->andReturn('ok');
+ $this->server->settings->update([
+ 'is_logdrain_newrelic_enabled' => true,
+ 'logdrain_newrelic_license_key' => 'abc123',
+ 'logdrain_newrelic_base_uri' => 'https://log-api.newrelic.com',
+ ]);
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->call('toggleLogDrain', 'cloudwatch')
+ ->assertSet('isLogDrainNewRelicEnabled', false)
+ ->assertSet('isLogDrainCloudwatchEnabled', true);
+
+ $settings = $this->server->settings->fresh();
+ expect($settings->is_logdrain_newrelic_enabled)->toBeFalsy()
+ ->and($settings->is_logdrain_cloudwatch_enabled)->toBeTrue();
+});
+
+it('reverts the CloudWatch flag when starting the drain fails', function () {
+ StartLogDrain::mock()->shouldReceive('handle')->andThrow(new RuntimeException('runtime boom'));
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->call('toggleLogDrain', 'cloudwatch')
+ ->assertSet('isLogDrainCloudwatchEnabled', false);
+
+ expect($this->server->settings->fresh()->is_logdrain_cloudwatch_enabled)->toBeFalse();
+});
+
+it('forbids team members from enabling CloudWatch', function () {
+ StartLogDrain::mock()->shouldNotReceive('handle');
+ $member = User::factory()->create();
+ $member->teams()->attach($this->team, ['role' => 'member']);
+ $this->actingAs($member);
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->call('toggleLogDrain', 'cloudwatch');
+
+ expect($this->server->settings->fresh()->is_logdrain_cloudwatch_enabled)->toBeFalse();
+});
+
+it('does not deploy the Fluent Bit container for CloudWatch', function () {
+ StopLogDrain::mock()->shouldReceive('handle')->once()->andReturn('removed');
+ $this->server->settings->update([
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_group' => 'coolify',
+ 'logdrain_cloudwatch_region' => 'us-east-1',
+ ]);
+
+ $result = StartLogDrain::run($this->server->fresh());
+
+ expect($result)->toContain('awslogs');
+});
+
+it('turns off the legacy Highlight drain when CloudWatch is enabled', function () {
+ StartLogDrain::mock()->shouldReceive('handle')->andReturn('ok');
+ $this->server->settings->update([
+ 'is_logdrain_highlight_enabled' => true,
+ 'logdrain_highlight_project_id' => 'legacy-project',
+ ]);
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->set('isLogDrainCloudwatchEnabled', true)
+ ->call('instantSave')
+ ->assertDispatched('success');
+
+ $settings = $this->server->settings->fresh();
+ expect($settings->is_logdrain_highlight_enabled)->toBeFalsy()
+ ->and($settings->is_logdrain_cloudwatch_enabled)->toBeTrue();
+});
+
+it('turns off the legacy Highlight drain when switching drains with toggleLogDrain', function () {
+ StartLogDrain::mock()->shouldReceive('handle')->andReturn('ok');
+ $this->server->settings->update(['is_logdrain_highlight_enabled' => true]);
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->call('toggleLogDrain', 'cloudwatch');
+
+ $settings = $this->server->settings->fresh();
+ expect($settings->is_logdrain_highlight_enabled)->toBeFalsy()
+ ->and($settings->is_logdrain_cloudwatch_enabled)->toBeTrue();
+});
+
+it('keeps the legacy Highlight drain when saving without enabling another drain', function () {
+ StartLogDrain::mock()->shouldReceive('handle')->andReturn('ok');
+ $this->server->settings->update(['is_logdrain_highlight_enabled' => true]);
+
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->call('submit')
+ ->assertDispatched('success');
+
+ expect($this->server->settings->fresh()->is_logdrain_highlight_enabled)->toBeTruthy();
+});
+
+it('rejects a save that would enable two log drains at once', function () {
+ StartLogDrain::mock()->shouldNotReceive('handle');
+ $this->server->settings->update([
+ 'is_logdrain_newrelic_enabled' => true,
+ 'logdrain_newrelic_license_key' => 'abc123',
+ 'logdrain_newrelic_base_uri' => 'https://log-api.newrelic.com',
+ ]);
+
+ // The UI disables the CloudWatch dropdown here; this simulates a crafted request.
+ Livewire::test(LogDrains::class, ['server_uuid' => $this->server->uuid])
+ ->set('logDrainCloudwatchGroup', 'coolify')
+ ->set('logDrainCloudwatchRegion', 'us-east-1')
+ ->set('isLogDrainCloudwatchEnabled', true)
+ ->call('instantSave')
+ ->assertDispatched('error')
+ ->assertSet('isLogDrainCloudwatchEnabled', false)
+ ->assertSet('isLogDrainNewRelicEnabled', true);
+
+ $settings = $this->server->settings->fresh();
+ expect($settings->is_logdrain_cloudwatch_enabled)->toBeFalse()
+ ->and($settings->is_logdrain_newrelic_enabled)->toBeTruthy();
+});
+
+it('keeps the Fluent Bit drain running if CloudWatch is also enabled, matching the containers logging config', function () {
+ Process::fake();
+ StopLogDrain::mock()->shouldReceive('handle')->andReturn('removed');
+ $this->server->update(['private_key_id' => PrivateKey::factory()->create(['team_id' => $this->team->id])->id]);
+ $this->server->settings->update([
+ 'is_logdrain_axiom_enabled' => true,
+ 'logdrain_axiom_dataset_name' => 'ds',
+ 'logdrain_axiom_api_key' => 'key',
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_group' => 'coolify',
+ 'logdrain_cloudwatch_region' => 'us-east-1',
+ ]);
+ $server = $this->server->fresh();
+
+ expect(generate_log_drain_configuration($server)['driver'])->toBe('fluentd');
+
+ StartLogDrain::run($server);
+
+ Process::assertRan(fn ($process) => str_contains($process->command, 'log-drains/docker-compose.yml up -d'));
+});
diff --git a/tests/Feature/MultiServerApplicationTest.php b/tests/Feature/MultiServerApplicationTest.php
index 2f586e07b8..8f47010ac3 100644
--- a/tests/Feature/MultiServerApplicationTest.php
+++ b/tests/Feature/MultiServerApplicationTest.php
@@ -320,6 +320,25 @@ describe('combined deployment notification', function () {
Notification::assertNothingSent();
});
+ test('takes commit details for the summary from the main deployment', function () {
+ $parent = ApplicationDeploymentQueue::create([
+ 'application_id' => $this->application->id,
+ 'deployment_uuid' => new_public_id(),
+ 'server_id' => $this->mainServer->id,
+ 'status' => ApplicationDeploymentStatus::FINISHED->value,
+ 'commit' => 'a1b2c3d4e5f60718293a4b5c6d7e8f9012345678',
+ 'commit_message' => 'Add checkout page',
+ ]);
+ Cache::put("multi-server-deployment-queued:{$parent->deployment_uuid}", true);
+ $child = createMultiServerDeployment($this->application, $this->extraServer, ApplicationDeploymentStatus::FINISHED->value, $parent->deployment_uuid);
+ $job = makeMultiServerDeploymentJob(['application' => $this->application, 'application_deployment_queue' => $child]);
+
+ callMultiServerDeploymentJob($job, 'sendMultiServerDeploymentNotification', $parent->deployment_uuid);
+
+ Notification::assertSentTo($this->team, DeploymentSuccess::class, fn (DeploymentSuccess $notification) => $notification->commit_sha === $parent->commit
+ && $notification->commit_message === 'Add checkout page');
+ });
+
test('sends a failed notification that links to the failed server deployment', function () {
$parentUuid = new_public_id();
Cache::put("multi-server-deployment-queued:{$parentUuid}", true);
diff --git a/tests/Feature/StandaloneSqliteTest.php b/tests/Feature/StandaloneSqliteTest.php
index b63b9917e5..845d88e5da 100644
--- a/tests/Feature/StandaloneSqliteTest.php
+++ b/tests/Feature/StandaloneSqliteTest.php
@@ -77,6 +77,32 @@ it('generates a compose file that passes the database files to the image', funct
->and($service['volumes'])->toBe(['sqlite-data-'.$this->database->uuid.':/var/lib/sqlite']);
});
+it('uses the server log drain driver when log draining is enabled', function () {
+ $commands = [];
+ $executor = Mockery::mock(DatabaseStartCommandExecutor::class);
+ $executor->shouldReceive('execute')->once()->withArgs(function (array $captured) use (&$commands) {
+ $commands = $captured;
+
+ return true;
+ })->andReturn(new Activity);
+ app()->instance(DatabaseStartCommandExecutor::class, $executor);
+ $this->server->settings->update([
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_region' => 'us-east-1',
+ 'logdrain_cloudwatch_group' => 'coolify',
+ ]);
+ $this->database->update(['is_log_drain_enabled' => true]);
+ Server::flushIdentityMap();
+
+ (new StartSqlite)->handle($this->database->fresh(), new Activity);
+
+ preg_match("/^echo '([^']+)' \| base64 -d/", collect($commands)->first(fn (string $command) => str_contains($command, 'docker-compose.yml')), $matches);
+ $service = Yaml::parse(base64_decode($matches[1]))['services'][$this->database->uuid];
+
+ expect($service['logging']['driver'])->toBe('awslogs')
+ ->and($service['logging']['options']['awslogs-group'])->toBe('coolify');
+});
+
it('restores a gzipped backup with .restore into the first database file', function () {
$command = app(DatabaseImportCommandBuilder::class)->buildRestoreCommand($this->database, '/tmp/restore_1', false);
diff --git a/tests/Feature/TerminalCapabilitiesTest.php b/tests/Feature/TerminalCapabilitiesTest.php
new file mode 100644
index 0000000000..7bb648d9b1
--- /dev/null
+++ b/tests/Feature/TerminalCapabilitiesTest.php
@@ -0,0 +1,58 @@
+set('app.key', 'base64:'.base64_encode(random_bytes(32)));
+ config()->set('constants.ssh.mux_enabled', false);
+ Storage::fake('ssh-keys');
+ $team = Team::factory()->create();
+ $key = PrivateKey::create([
+ 'name' => 'Terminal test key',
+ 'private_key' => RSA::createKey(1024)->toString('OpenSSH'),
+ 'team_id' => $team->id,
+ ]);
+ $server = Server::factory()->create([
+ 'user' => $user,
+ 'team_id' => $team->id,
+ 'private_key_id' => $key->id,
+ ]);
+ Process::fake(fn () => Process::result(output: 'true'));
+
+ $terminal = new Terminal;
+ expect((new ReflectionMethod(Terminal::class, 'containerKeepsStdinOpen'))->invoke($terminal, $server, 'game-1'))->toBeTrue();
+ expect((new ReflectionMethod(Terminal::class, 'checkShellAvailability'))->invoke($terminal, $server, 'game-1'))->toBeTrue();
+
+ Process::assertRan(function ($process) use ($sudo) {
+ if (! str_contains($process->command, 'docker inspect')) {
+ return false;
+ }
+ expect($process->command)
+ ->toContain("\n{$sudo}docker inspect --format '{{.Config.OpenStdin}}' 'game-1' 2>/dev/null\n")
+ ->not->toContain('sudo sudo');
+
+ return str_contains($process->command, 'docker inspect');
+ });
+ Process::assertRan(function ($process) use ($sudo) {
+ if (! str_contains($process->command, 'docker exec')) {
+ return false;
+ }
+ expect($process->command)
+ ->toContain("{$sudo}docker exec 'game-1' bash -c 'exit 0' 2>/dev/null || {$sudo}docker exec 'game-1' sh -c 'exit 0' 2>/dev/null")
+ ->not->toContain('sudo sudo');
+
+ return true;
+ });
+})->with([
+ 'root' => ['root', ''],
+ 'non-root' => ['ubuntu', 'sudo '],
+]);
diff --git a/tests/Feature/TerminalConsoleModeTest.php b/tests/Feature/TerminalConsoleModeTest.php
new file mode 100644
index 0000000000..85ec73ea77
--- /dev/null
+++ b/tests/Feature/TerminalConsoleModeTest.php
@@ -0,0 +1,156 @@
+makePartial();
+ $server->shouldReceive('isNonRoot')->andReturn($nonRoot);
+
+ return $server;
+}
+
+it('builds an interactive attach command with safe detach keys for console mode', function () {
+ $command = app(TerminalSessionService::class)->containerCommand(consoleModeServer(false), 'minecraft-abc123', 'attach');
+
+ expect($command)
+ // Primes the console with recent logs, then attaches for live output.
+ ->toContain("docker logs --tail 200 'minecraft-abc123' 2>&1; ")
+ ->toContain('exec docker attach --detach-keys="ctrl-p,ctrl-q" --sig-proxy=false \'minecraft-abc123\'');
+});
+
+it('prefixes sudo for non-root servers in console mode', function () {
+ $command = app(TerminalSessionService::class)->containerCommand(consoleModeServer(true), 'minecraft-abc123', 'attach');
+
+ expect($command)
+ ->toStartWith('sudo docker logs --tail 200 ')
+ ->toContain('exec sudo docker attach --detach-keys="ctrl-p,ctrl-q" --sig-proxy=false ');
+});
+
+it('keeps the interactive shell command for shell mode', function () {
+ $command = app(TerminalSessionService::class)->containerCommand(consoleModeServer(false), 'web-1', 'shell');
+
+ expect($command)
+ ->toContain("docker exec -it 'web-1' sh -c")
+ ->not->toContain('docker attach');
+});
+
+it('defaults to console mode when the container keeps stdin open', function () {
+ $terminal = new Terminal;
+ $terminal->attachAvailable = true;
+
+ expect($terminal->resolveMode(null))->toBe('attach');
+});
+
+it('defaults to shell mode when the container has no open stdin', function () {
+ $terminal = new Terminal;
+ $terminal->attachAvailable = false;
+
+ expect($terminal->resolveMode(null))->toBe('shell');
+});
+
+it('never selects console mode when attach is unavailable even if requested', function () {
+ $terminal = new Terminal;
+ $terminal->attachAvailable = false;
+
+ expect($terminal->resolveMode('attach'))->toBe('shell');
+});
+
+it('renders a line-oriented command box for console mode instead of a raw terminal', function () {
+ $view = file_get_contents(resource_path('views/livewire/project/shared/terminal.blade.php'));
+
+ expect($view)
+ ->toContain('terminal-console-input')
+ ->toContain('submitConsoleCommand()')
+ ->toContain('x-ref="consoleInput"')
+ // The mobile control toolbar (which can send Ctrl-C) is hidden in console mode.
+ ->toContain("terminalActive && \$wire.terminalMode !== 'attach'")
+ // The earlier guardrail UI is gone in favour of the command box.
+ ->not->toContain('detachTerminal()')
+ ->not->toContain('Ctrl-C can stop the app');
+});
+
+it('keeps the console terminal read-only and sends whole command lines', function () {
+ $client = file_get_contents(resource_path('js/terminal.js'));
+
+ expect($client)
+ ->toContain('isConsoleMode()')
+ // Keystrokes are not forwarded while attached; commands carry a trailing newline.
+ ->toContain('message: `${command}\n`')
+ ->toContain('this.term.options.disableStdin = consoleMode');
+});
+
+it('places the shell/console selector beside the theme selector using shared styling', function () {
+ $selector = file_get_contents(resource_path('views/components/terminal/mode-selector.blade.php'));
+
+ expect($selector)
+ // Reuses the shared trigger + menu styling from the theme/renderer selectors.
+ ->toContain('terminal-theme-trigger')
+ ->toContain('console-theme-selector')
+ // Only shown when the container is interactive; drives the parent Alpine state.
+ ->toContain('x-show="attachAvailable"')
+ ->toContain('setTerminalMode(')
+ ->toContain("'key' => 'shell'")
+ ->toContain("'key' => 'attach'");
+
+ foreach (['project/shared/execute-container-command', 'terminal/index'] as $view) {
+ $blade = file_get_contents(resource_path("views/livewire/{$view}.blade.php"));
+
+ expect($blade)
+ // Grouped with the theme selector so extra header options do not break the layout.
+ ->toContain('
Big heading
') + ->toContain('# Big heading'); +}); + +it('lets team admins toggle commit details from email notification settings', function () { + $admin = User::factory()->create(); + $this->team->members()->attach($admin->id, ['role' => 'admin']); + $this->actingAs($admin); + session(['currentTeam' => $this->team]); + Cache::flush(); + + Livewire::test(NotificationEmail::class) + ->assertSet('deploymentCommitDetailsEmailNotifications', false) + ->set('deploymentCommitDetailsEmailNotifications', true) + ->call('instantSaveDeploymentCommitDetails') + ->assertHasNoErrors(); + + expect($this->team->emailNotificationSettings->fresh()->deployment_commit_details_email_notifications)->toBeTrue(); +}); + +it('does not let team members change the commit details setting', function () { + $member = User::factory()->create(); + $this->team->members()->attach($member->id, ['role' => 'member']); + $this->actingAs($member); + session(['currentTeam' => $this->team]); + Cache::flush(); + + Livewire::test(NotificationEmail::class) + ->set('deploymentCommitDetailsEmailNotifications', true) + ->call('instantSaveDeploymentCommitDetails') + ->assertSet('deploymentCommitDetailsEmailNotifications', false); + + expect($this->team->emailNotificationSettings->fresh()->deployment_commit_details_email_notifications)->toBeFalse(); +}); + +it('does not let admins of another team change the commit details setting', function () { + $otherTeam = Team::factory()->create(); + $outsider = User::factory()->create(); + $otherTeam->members()->attach($outsider->id, ['role' => 'admin']); + $this->actingAs($outsider); + session(['currentTeam' => $otherTeam]); + Cache::flush(); + + Livewire::test(NotificationEmail::class) + ->set('deploymentCommitDetailsEmailNotifications', true) + ->call('instantSaveDeploymentCommitDetails'); + + expect($this->team->emailNotificationSettings->fresh()->deployment_commit_details_email_notifications)->toBeFalse() + ->and($otherTeam->emailNotificationSettings->fresh()->deployment_commit_details_email_notifications)->toBeTrue(); +}); + +function bigMarkdownCommitMessage(): string +{ + return implode("\n", [ + 'feat(checkout): rebuild payment flow', + '', + '# Heading one', + 'Setext heading', + '==============', + '## Heading two', + '- bullet one', + '* bullet two', + '+ bullet three', + '1. first step', + '2. second step', + '> quoted text', + ' indented code line', + '```php', + 'echo "hello";', + '```', + '| Column A | Column B |', + '| -------- | -------- |', + '| cell 1 | cell 2 |', + '**bold** _italic_ ~~strike~~ `inline code`', + '[Reset your password](https://evil.example.com/reset)', + '', + '',
+ 'click me',
+ '---',
+ 'Co-authored-by: Jane Doe ')
+ ->toContain('
// close-on-upgrade: complete the handshake, then close with 4401 (session rejected)
// reject-token: on the first client frame, send the legacy text message and close with 4403
+// ready: on the first client frame, signal that the PTY is ready
//
// Prints the listening port on stdout. GET /stats returns {"upgrades": n}.
import { createHash } from 'node:crypto';
@@ -57,6 +58,11 @@ server.on('upgrade', (req, socket) => {
}
socket.once('data', () => {
+ if (mode === 'ready') {
+ socket.write(frame(0x1, Buffer.from('pty-ready')));
+ return;
+ }
+
const message = 'Unauthorized: Terminal token was rejected';
socket.write(frame(0x1, Buffer.from(message)));
socket.end(closeFrame(4403, message));
diff --git a/tests/Unit/GenerateLogDrainConfigurationTest.php b/tests/Unit/GenerateLogDrainConfigurationTest.php
new file mode 100644
index 0000000000..0ac5eb05b2
--- /dev/null
+++ b/tests/Unit/GenerateLogDrainConfigurationTest.php
@@ -0,0 +1,77 @@
+setRelation('settings', new ServerSetting($attributes));
+
+ return $server;
+}
+
+it('uses the fluentd driver when CloudWatch is not the active drain', function () {
+ $server = serverWithLogDrainSettings(['is_logdrain_axiom_enabled' => true]);
+
+ expect(generate_log_drain_configuration($server))->toBe(generate_fluentd_configuration());
+});
+
+it('uses the awslogs driver with every configured option', function () {
+ $server = serverWithLogDrainSettings([
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_region' => 'eu-west-1',
+ 'logdrain_cloudwatch_group' => '/coolify/prod',
+ 'logdrain_cloudwatch_stream_prefix' => 'docker/',
+ ]);
+
+ expect(generate_log_drain_configuration($server))->toBe([
+ 'driver' => 'awslogs',
+ 'options' => [
+ 'awslogs-region' => 'eu-west-1',
+ 'awslogs-group' => '/coolify/prod',
+ 'awslogs-create-group' => 'true',
+ 'mode' => 'non-blocking',
+ 'tag' => 'docker/{{.Name}}',
+ ],
+ ]);
+});
+
+it('names streams after the container when no prefix is set', function () {
+ $server = serverWithLogDrainSettings([
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_region' => 'us-east-1',
+ 'logdrain_cloudwatch_group' => 'coolify',
+ ]);
+
+ expect(generate_log_drain_configuration($server)['options']['tag'])->toBe('{{.Name}}');
+});
+
+it('does not fall back to a default region', function () {
+ $server = serverWithLogDrainSettings([
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_group' => 'coolify',
+ ]);
+
+ expect(generate_log_drain_configuration($server)['options'])->not->toHaveKey('awslogs-region');
+});
+
+it('never sets awslogs-stream because it would override the container-name tag', function () {
+ $server = serverWithLogDrainSettings([
+ 'is_logdrain_cloudwatch_enabled' => true,
+ 'logdrain_cloudwatch_group' => 'coolify',
+ 'logdrain_cloudwatch_stream_prefix' => 'apps/',
+ ]);
+
+ expect(generate_log_drain_configuration($server)['options'])->not->toHaveKey('awslogs-stream');
+});
+
+it('reports CloudWatch as an enabled drain that does not use Fluent Bit', function () {
+ $cloudwatch = serverWithLogDrainSettings(['is_logdrain_cloudwatch_enabled' => true]);
+ $axiom = serverWithLogDrainSettings(['is_logdrain_axiom_enabled' => true]);
+
+ expect($cloudwatch->isLogDrainEnabled())->toBeTrue()
+ ->and($cloudwatch->isFluentBitLogDrainEnabled())->toBeFalse()
+ ->and($axiom->isLogDrainEnabled())->toBeTrue()
+ ->and($axiom->isFluentBitLogDrainEnabled())->toBeTrue();
+});
diff --git a/tests/v4/Browser/TerminalConsoleFocusTest.php b/tests/v4/Browser/TerminalConsoleFocusTest.php
new file mode 100644
index 0000000000..fd751ab130
--- /dev/null
+++ b/tests/v4/Browser/TerminalConsoleFocusTest.php
@@ -0,0 +1,83 @@
+set('app.maintenance.store', 'array');
+ config()->set('constants.ssh.mux_enabled', false);
+ $this->terminalServer = null;
+});
+
+afterEach(function () {
+ $this->terminalServer?->stop(0);
+});
+
+it('keeps the active input focused through all PTY startup callbacks', function (bool $attach) {
+ $stack = seedBrowserResourceStack();
+ $stack['server']->settings->update(['is_terminal_enabled' => true]);
+ Cache::flush();
+
+ Process::fake(function ($process) use ($attach) {
+ $command = (string) $process->command;
+ if (str_contains($command, 'docker ps -a')) {
+ return Process::result(output: json_encode(['Names' => 'app-terminal-focus-1', 'State' => 'running', 'Labels' => '']));
+ }
+ if (str_contains($command, 'Config.OpenStdin')) {
+ return Process::result(output: $attach ? 'true' : 'false');
+ }
+ if (str_contains($command, 'docker inspect')) {
+ return Process::result(output: json_encode(['State' => ['Status' => 'running']]));
+ }
+
+ return Process::result();
+ });
+
+ $this->terminalServer = new SymfonyProcess(['node', base_path('tests/Fixtures/terminal-websocket-rejection-server.mjs'), 'ready']);
+ $this->terminalServer->start();
+ $this->terminalServer->waitUntil(fn (string $type, string $output) => str_contains($output, "\n"));
+ config()->set('constants.terminal.protocol', 'ws');
+ config()->set('constants.terminal.host', '127.0.0.1');
+ config()->set('constants.terminal.port', trim($this->terminalServer->getOutput()));
+
+ $page = visit('/login')
+ ->fill('email', 'test@example.com')
+ ->fill('password', 'password')
+ ->click('Login')
+ ->assertSee('Dashboard')
+ ->navigate('/terminal')
+ ->click('[data-terminal-target-picker="page"] button:has-text("app-terminal-focus-1")')
+ ->assertVisible('.xterm-viewport')
+ ->wait(0.75);
+
+ $selector = $attach ? '[x-ref="consoleInput"]' : '.xterm-helper-textarea';
+ expect($page->script("document.activeElement.matches('$selector')"))->toBeTrue();
+
+ // Exercise the same ready handler on reconnect. Blur after the 100 ms callback
+ // so only the 500 ms callback can restore focus, not the initial focus call.
+ $focusedInputs = $page->script(<<<'JS'
+ async () => {
+ const terminal = Alpine.$data(document.getElementById('terminal-container'));
+ const focusedInput = () => document.activeElement.matches('[x-ref="consoleInput"]') ? 'console' :
+ document.activeElement.matches('.xterm-helper-textarea') ? 'shell' : 'other';
+ terminal.handleSocketMessage({ data: 'pty-ready' });
+ const immediate = focusedInput();
+ await new Promise(resolve => setTimeout(resolve, 150));
+ const after100ms = focusedInput();
+ document.activeElement.blur();
+ await new Promise(resolve => setTimeout(resolve, 450));
+ return [immediate, after100ms, focusedInput()];
+ }
+ JS);
+
+ $expectedInput = $attach ? 'console' : 'shell';
+ expect($focusedInputs)->toBe([$expectedInput, $expectedInput, $expectedInput]);
+ $page->assertNoJavaScriptErrors()
+ ->screenshot(filename: $attach ? 'terminal-console-startup-focus' : 'terminal-shell-startup-focus');
+})->with(['console' => true, 'shell' => false]);