more fixes

Author: Crow-Control

app/api/container.test.ts

@@ -1000,6 +1000,22 @@ describe('Container Router', () => {
       expect(res.json).toHaveBeenCalledWith(expect.any(Array));
     });
 
+    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);

app/api/trigger.test.ts

@@ -261,6 +261,32 @@ describe('Trigger Router', () => {
         }),
       );
     });
+
+    test('should return 400 when trigger conditions are not met and container id is missing', async () => {
+      const mockTrigger = {
+        mustTrigger: vi.fn().mockReturnValue(false),
+        trigger: vi.fn(),
+      };
+      registry.getState.mockReturnValue({
+        trigger: { 'slack.default': mockTrigger },
+      });
+
+      const req = {
+        params: { type: 'slack', name: 'default' },
+        body: {},
+      };
+      const res = createResponse();
+
+      await runTrigger(req, res);
+
+      expect(mockTrigger.trigger).not.toHaveBeenCalled();
+      expect(res.status).toHaveBeenCalledWith(400);
+      expect(res.json).toHaveBeenCalledWith(
+        expect.objectContaining({
+          error: expect.stringContaining('Trigger conditions not met'),
+        }),
+      );
+    });
   });
 
   describe('runRemoteTrigger', () => {

app/api/trigger.ts

@@ -115,7 +115,7 @@ async function runRemoteTrigger(req, res) {
       !localProxyTrigger.mustTrigger(containerToTrigger)
     ) {
       log.warn(
-        `Remote trigger conditions not met (agent=${sanitizeLogParam(agentName)}, type=${sanitizeLogParam(triggerType)}, name=${sanitizeLogParam(triggerName)}, container=${sanitizeLogParam(containerToTrigger.id || 'unknown')})`,
+        `Remote trigger conditions not met (agent=${sanitizeLogParam(agentName)}, type=${sanitizeLogParam(triggerType)}, name=${sanitizeLogParam(triggerName)}, container=${sanitizeLogParam(containerToTrigger.id)})`,
       );
       res.status(400).json({
         error: `Trigger conditions not met for ${triggerType}.${triggerName} on agent ${agentName} (check include/exclude and requireinclude settings)`,

app/watchers/providers/docker/Docker.test.ts

@@ -1416,6 +1416,105 @@ describe('Docker Watcher', () => {
       expect(storeContainer.updateContainer).not.toHaveBeenCalled();
     });
 
+    test('should use old container name when inspect name is empty and compose trigger is created', async () => {
+      await docker.register('watcher', 'docker', 'test', {});
+      docker.log = createMockLogWithChild(['info']);
+      mockContainer.inspect.mockResolvedValue({
+        Name: '',
+        State: { Status: 'running' },
+        Config: {
+          Labels: {
+            'dd.compose.file': '/tmp/my-stack/docker-compose.yml',
+          },
+        },
+      });
+      const existingContainer = {
+        id: 'container123',
+        name: 'old-compose-name',
+        displayName: 'old-compose-name',
+        status: 'running',
+        image: { name: 'library/nginx' },
+        labels: {
+          'dd.compose.file': '/tmp/my-stack/docker-compose.yml',
+        },
+      };
+      storeContainer.getContainer.mockReturnValue(existingContainer);
+
+      await docker.onDockerEvent(Buffer.from('{"Action":"start","id":"container123"}\n'));
+
+      expect(registry.ensureDockercomposeTriggerForContainer).toHaveBeenCalledWith(
+        'old-compose-name',
+        '/tmp/my-stack/docker-compose.yml',
+        {},
+      );
+    });
+
+    test('should use old container name in warning when compose trigger creation fails and inspect name is empty', async () => {
+      await docker.register('watcher', 'docker', 'test', {});
+      docker.log = createMockLogWithChild(['warn']);
+      mockContainer.inspect.mockResolvedValue({
+        Name: '',
+        State: { Status: 'running' },
+        Config: {
+          Labels: {
+            'dd.compose.file': '/tmp/my-stack/docker-compose.yml',
+          },
+        },
+      });
+      const existingContainer = {
+        id: 'container123',
+        name: 'old-compose-name',
+        displayName: 'old-compose-name',
+        status: 'running',
+        image: { name: 'library/nginx' },
+        labels: {
+          'dd.compose.file': '/tmp/my-stack/docker-compose.yml',
+        },
+      };
+      storeContainer.getContainer.mockReturnValue(existingContainer);
+
+      vi.spyOn(registry, 'ensureDockercomposeTriggerForContainer').mockRejectedValueOnce(
+        new Error('event create failed'),
+      );
+
+      await docker.onDockerEvent(Buffer.from('{"Action":"start","id":"container123"}\n'));
+
+      expect(docker.log._child.warn).toHaveBeenCalledWith(
+        expect.stringContaining('old-compose-name'),
+      );
+    });
+
+    test('should skip update when compose label is absent, cached trigger exists, and trigger include is unchanged', async () => {
+      await docker.register('watcher', 'docker', 'test', {});
+      docker.log = createMockLogWithChild(['info']);
+      mockContainer.inspect.mockResolvedValue({
+        Name: '/compose-container',
+        State: { Status: 'running' },
+        Config: {
+          Labels: {},
+        },
+      });
+      const existingContainer = {
+        id: 'container123',
+        name: 'compose-container',
+        displayName: 'compose-container',
+        status: 'running',
+        image: { name: 'library/nginx' },
+        labels: {},
+        triggerInclude: undefined,
+      };
+      docker.composeTriggersByContainer = {
+        container123: 'dockercompose.my-stack-compose-container',
+      };
+      storeContainer.getContainer.mockReturnValue(existingContainer);
+
+      await docker.onDockerEvent(Buffer.from('{"Action":"start","id":"container123"}\n'));
+
+      expect(existingContainer.triggerInclude).toBeUndefined();
+      expect(docker.composeTriggersByContainer.container123).toBeUndefined();
+      expect(storeContainer.updateContainer).not.toHaveBeenCalled();
+    });
+
     test('should skip store update when inspect payload does not change tracked fields', async () => {
       await docker.register('watcher', 'docker', 'test', {});
       docker.log = createMockLogWithChild(['info']);
@@ -4619,6 +4718,10 @@ describe('Docker Watcher', () => {
       expect(testable_removeTriggerId('ntfy.default:major', undefined)).toBe('ntfy.default:major');
     });
 
+    test('removeTriggerId should return undefined when last trigger is removed', () => {
+      expect(testable_removeTriggerId('dockercompose.test', 'dockercompose.test')).toBeUndefined();
+    });
+
 
     test('getCurrentPrefix should return the non-numeric prefix before the first digit', () => {
       expect(testable_getCurrentPrefix('v2026.2.1')).toBe('v');