Merge upstream/main into fork (v1.5.0-rc.12)

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - **Tag update display accuracy** — Fixed update classification/display so tag-based updates are shown correctly as tag updates.
+
 ## [1.5.0-rc.12] — 2026-04-22
 
 ### Fixed

app/api/component.test.ts

@@ -65,42 +65,6 @@ describe('Component Router', () => {
       expect(result.agent).toBe('remote-agent');
     });
 
-    test('should include requireinclude for triggers even when masked config omits it', () => {
-      const comp = {
-        kind: 'trigger',
-        type: 'dockercompose',
-        name: 'my-service',
-        configuration: { requireinclude: true, auto: true },
-        maskConfiguration: vi.fn(() => ({ auto: true })),
-        agent: undefined,
-      };
-
-      const result = component.mapComponentToItem('dockercompose.my-service', comp, 'trigger');
-
-      expect(result.configuration).toEqual({
-        auto: true,
-        requireinclude: true,
-      });
-    });
-
-    test('should keep masked requireinclude when already present', () => {
-      const comp = {
-        kind: 'trigger',
-        type: 'dockercompose',
-        name: 'my-service',
-        configuration: { requireinclude: true, auto: true },
-        maskConfiguration: vi.fn(() => ({ auto: true, requireinclude: false })),
-        agent: undefined,
-      };
-
-      const result = component.mapComponentToItem('dockercompose.my-service', comp, 'trigger');
-
-      expect(result.configuration).toEqual({
-        auto: true,
-        requireinclude: false,
-      });
-    });
-
     test('should fallback to raw configuration when maskConfiguration is unavailable', () => {
       const comp = {
         type: 'docker',

app/api/component.ts

@@ -73,18 +73,6 @@ export function mapComponentToItem(
       ? redactTriggerConfigurationInfrastructureDetails(configuration)
       : configuration;
 
-  // Preserve requireinclude for triggers even when maskConfiguration omits it
-  if (
-    kind === 'trigger' &&
-    (component as any).configuration?.requireinclude !== undefined &&
-    sanitizedConfiguration != null &&
-    typeof sanitizedConfiguration === 'object' &&
-    !Array.isArray(sanitizedConfiguration) &&
-    (sanitizedConfiguration as any).requireinclude === undefined
-  ) {
-    (sanitizedConfiguration as any).requireinclude = (component as any).configuration.requireinclude;
-  }
-
   const item: ApiComponent = {
     id: key,
     type: component.type,

app/api/container.test.ts

@@ -2311,22 +2311,6 @@ describe('Container Router', () => {
       expect(res.json).toHaveBeenCalledWith({ data: expect.any(Array), total: 1 });
     });
 
-    test('should associate trigger when configuration is missing', async () => {
-      const res = await callGetContainerTriggers({ id: 'c1' }, [
-        { type: 'slack', name: 'default' },
-      ]);
-
-      const triggers = getTriggersFromResponse(res);
-      expect(triggers).toHaveLength(1);
-      expect(triggers[0]).toEqual(
-        expect.objectContaining({
-          type: 'slack',
-          name: 'default',
-          configuration: {},
-        }),
-      );
-    });
-
     test('should filter triggers with triggerInclude', async () => {
       Trigger.parseIncludeOrIncludeTriggerString.mockReturnValue({ id: 'slack.default' });
       Trigger.doesReferenceMatchId.mockImplementation((ref, id) => ref === id);
@@ -2370,16 +2354,6 @@ describe('Container Router', () => {
       expect(getTriggersFromResponse(res)).toHaveLength(0);
     });
 
-    test('should keep non-docker local triggers for remote containers', async () => {
-      const res = await callGetContainerTriggers({ id: 'c1', agent: 'agent-1' }, [
-        { type: 'slack', name: 'default', configuration: {} },
-      ]);
-
-      const triggers = getTriggersFromResponse(res);
-      expect(triggers).toHaveLength(1);
-      expect(triggers[0].type).toBe('slack');
-    });
-
     test('should include triggers with matching include threshold', async () => {
       Trigger.parseIncludeOrIncludeTriggerString.mockReturnValue({
         id: 'slack.default',
@@ -2395,18 +2369,6 @@ describe('Container Router', () => {
       expect(triggers).toHaveLength(1);
       expect(triggers[0].configuration.threshold).toBe('all');
     });
-
-    test('should exclude requireinclude triggers when container has no include list', async () => {
-      const res = await callGetContainerTriggers({ id: 'c1' }, [
-        { type: 'slack', name: 'default', configuration: { requireinclude: true } },
-        { type: 'email', name: 'default', configuration: { requireinclude: false } },
-      ]);
-
-      expect(res.status).toHaveBeenCalledWith(200);
-      const triggers = getTriggersFromResponse(res);
-      expect(triggers).toHaveLength(1);
-      expect(triggers[0].type).toBe('email');
-    });
   });
 
   describe('runTrigger', () => {
@@ -2458,24 +2420,6 @@ describe('Container Router', () => {
       });
     });
 
-    test('should return 400 when trigger conditions are not met', async () => {
-      const mockTrigger = {
-        mustTrigger: vi.fn().mockReturnValue(false),
-        trigger: vi.fn(),
-      };
-      storeContainer.getContainer.mockReturnValue({ id: 'c1' });
-      registry.getState.mockReturnValue({ watcher: {}, trigger: { 'slack.default': mockTrigger } });
-      const res = await callRunTrigger({ id: 'c1', triggerType: 'slack', triggerName: 'default' });
-
-      expect(mockTrigger.trigger).not.toHaveBeenCalled();
-      expect(res.status).toHaveBeenCalledWith(400);
-      expect(res.json).toHaveBeenCalledWith(
-        expect.objectContaining({
-          error: expect.stringContaining('Trigger conditions not met'),
-        }),
-      );
-    });
-
     test('should use triggerAgent in trigger id when provided', async () => {
       const mockTrigger = { trigger: vi.fn().mockResolvedValue(undefined) };
       storeContainer.getContainer.mockReturnValue({ id: 'c1' });