onOpenDetail(item)}
+ // Same press-scale opt-out as the desktop Discover card (#2158).
+ data-no-press
onKeyDown={e => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onOpenDetail(item) } }}
className="overflow-hidden rounded-[18px] border border-[color:var(--m-rowbr)] bg-[color:var(--m-sheetop)]">
diff --git a/client/tests/unit/mobile/admin/MAdminPluginsPanel.test.tsx b/client/tests/unit/mobile/admin/MAdminPluginsPanel.test.tsx
index 56ee3939b..3aadd7a99 100644
--- a/client/tests/unit/mobile/admin/MAdminPluginsPanel.test.tsx
+++ b/client/tests/unit/mobile/admin/MAdminPluginsPanel.test.tsx
@@ -452,6 +452,16 @@ describe('MAdminPluginsPanel — Discover', () => {
fireEvent.keyDown(card, { key: 'Enter' });
expect(await screen.findByRole('dialog')).toBeInTheDocument();
});
+
+ it('FE-MOB-PLUGP-093: the card opts out of the global press-scale (#2158)', async () => {
+ // jsdom cannot replay the browser mechanics behind #2158: the :active scale on
+ // the card shifted the Install button out from under the pointer, so the tap
+ // retargeted onto the card and opened the detail sheet instead of installing.
+ // The data-no-press attribute is the pin.
+ await openDiscover([registryEntry()]);
+
+ expect((await screen.findByText('Acme')).closest('[role="button"]')).toHaveAttribute('data-no-press');
+ });
});
describe('MAdminPluginsPanel — the registry detail sheet', () => {
diff --git a/server/src/nest/plugins/plugins.controller.ts b/server/src/nest/plugins/plugins.controller.ts
index 0e6e0ea70..784703864 100644
--- a/server/src/nest/plugins/plugins.controller.ts
+++ b/server/src/nest/plugins/plugins.controller.ts
@@ -147,17 +147,38 @@ export class PluginsController {
/**
* Save the admin-owned `scope:'instance'` settings. A RUNNING plugin gets its config
* once, in the child's init envelope — so a save re-spawns it (like the egress-hosts
- * PUT), and `restarted` tells the UI whether that happened.
+ * PUT), and `restarted` tells the UI whether that happened. A respawn that fails
+ * answers 409 `{ error, code: 'RESTART_FAILED', config }`: the save itself landed,
+ * so the envelope still carries the stored config.
*/
@Put(':id/config')
async updateConfig(@Param('id') id: string, @Body() body: PluginConfigDto): Promise
{
+ // Same gate as the egress-hosts twin: the respawn below is a spawn, and the kill
+ // switch is read live, so a save must not start a child while plugins are off.
+ if (!pluginsEnabled()) throw new HttpException({ error: 'Plugins are disabled by server configuration' }, 503);
+ let config: Record;
try {
- const config = this.plugins.updateInstanceConfig(id, body || {});
- return { config, restarted: await this.runtime.respawnIfActive(id) };
+ config = this.plugins.updateInstanceConfig(id, body || {});
} catch (e) {
if (e instanceof MissingRequiredSettingError) throw new HttpException({ error: e.message }, 400);
throw e;
}
+ try {
+ return { config, restarted: await this.runtime.respawnIfActive(id) };
+ } catch (e) {
+ // The config IS written by this point, only bringing the child back up failed
+ // (a widened permission set awaiting re-consent, a dependency that went away).
+ // Reporting that as a failed save would be a lie, so the envelope carries the
+ // saved config and names the restart as the part that broke. `disable()` leaves
+ // the row enabled while no child runs, so record the plugin as off: the enable
+ // toggle is where the real reason is offered as a decision the admin can take.
+ await this.runtime.deactivate(id).catch(() => {});
+ const reason = e instanceof Error ? e.message : 'restart failed';
+ throw new HttpException(
+ { error: `Settings saved, but ${id} could not be restarted: ${reason}`, code: 'RESTART_FAILED', config },
+ 409,
+ );
+ }
}
/**
diff --git a/server/tests/unit/plugins/plugin-instance-settings.test.ts b/server/tests/unit/plugins/plugin-instance-settings.test.ts
index e72d165cf..66adca849 100644
--- a/server/tests/unit/plugins/plugin-instance-settings.test.ts
+++ b/server/tests/unit/plugins/plugin-instance-settings.test.ts
@@ -7,6 +7,7 @@
* the child once, in its init envelope), and an inactive plugin is left alone.
*/
import { describe, it, expect, beforeAll, beforeEach, afterEach, vi } from 'vitest';
+import { HttpException } from '@nestjs/common';
import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
@@ -25,7 +26,7 @@ import { createTables } from '../../../src/db/schema';
import { runMigrations } from '../../../src/db/migrations';
import { PluginsService } from '../../../src/nest/plugins/plugins.service';
import { PluginsController } from '../../../src/nest/plugins/plugins.controller';
-import type { PluginRuntimeService } from '../../../src/nest/plugins/plugin-runtime.service';
+import { PluginConsentRequired, type PluginRuntimeService } from '../../../src/nest/plugins/plugin-runtime.service';
import type { PluginRegistryService } from '../../../src/nest/plugins/registry/registry.service';
import type { RuntimeEnvService } from '../../../src/nest/app-config/runtime-env.service';
import { AddonsService } from '../../../src/nest/addons/addons.service';
@@ -260,6 +261,48 @@ describe('admin config endpoints (controller)', () => {
expect(out.config).toEqual({});
expect(out.restarted).toBe(false);
});
+
+ it('INS-010: with the kill switch off the save is refused before anything is written', async () => {
+ install('p');
+ declareField('p', 'apiUrl', 'instance');
+ process.env.TREK_PLUGINS_ENABLED = 'false';
+ const respawnIfActive = vi.fn(async () => false);
+
+ const failed = await controllerWith({ respawnIfActive })
+ .updateConfig('p', { apiUrl: 'https://y.example' })
+ .then(() => null, (e: unknown) => e as HttpException);
+
+ expect(failed?.getStatus()).toBe(503);
+ // The respawn is a spawn: it must not run while the whole plugin system is off.
+ expect(respawnIfActive).not.toHaveBeenCalled();
+ expect(svc().getInstanceConfig('p')).toEqual({});
+ });
+
+ it('INS-011: a respawn that fails reports the save that DID happen, and stops claiming the plugin runs', async () => {
+ install('p');
+ declareField('p', 'apiUrl', 'instance');
+ const deactivate = vi.fn(async () => {});
+ const respawnIfActive = vi.fn(async () => {
+ throw new PluginConsentRequired('plugin p requires consent for db:read:trips', ['db:read:trips']);
+ });
+
+ const failed = await controllerWith({ respawnIfActive, deactivate })
+ .updateConfig('p', { apiUrl: 'https://y.example' })
+ .then(() => null, (e: unknown) => e as HttpException);
+
+ expect(failed?.getStatus()).toBe(409);
+ // The envelope carries the saved config and names the restart as the part that broke:
+ // the message must not read as "your settings were lost", because they were not.
+ expect(failed?.getResponse()).toMatchObject({
+ code: 'RESTART_FAILED',
+ config: { apiUrl: 'https://y.example' },
+ error: expect.stringMatching(/Settings saved.*db:read:trips/),
+ });
+ expect(svc().getInstanceConfig('p')).toEqual({ apiUrl: 'https://y.example' });
+ // disable() leaves the row enabled, so the admin list would keep showing a plugin
+ // that no longer has a child. The enable toggle is where the reason is offered.
+ expect(deactivate).toHaveBeenCalledWith('p');
+ });
});
describe('defaults reach the child at spawn', () => {