🐛 fix(triggers): suppress duplicate server name in notification prefix and suffix (#283)

- getNotificationWatcherSuffix now accepts the resolved prefix and server
  name; when a prefix is present and the watcher matches that server
  identity (case-insensitive), the suffix is suppressed
- Extract getNotificationServerName helper to derive identity once
- Distinct watcher names still render: [prod-server] Container nginx (servicevault)
- 🧪 Regression tests for duplicated agent case and duplicated controller case

Author: s-b-e-n-s-o-n

app/triggers/providers/Trigger.test.ts

@@ -2123,6 +2123,43 @@ test('renderSimpleBody should combine agent prefix and watcher suffix', () => {
   );
 });
 
+test('renderSimpleBody should omit watcher suffix when it matches the agent prefix', () => {
+  const { simplebody, ...rest } = configurationValid;
+  trigger.configuration = trigger.validateConfiguration(rest);
+  expect(
+    trigger.renderSimpleBody({
+      name: 'nginx',
+      agent: 'mediavault',
+      watcher: 'mediavault',
+      updateKind: {
+        kind: 'tag',
+        localValue: '1.0.0',
+        remoteValue: '2.0.0',
+      },
+    }),
+  ).toBe('[mediavault] Container nginx running with tag 1.0.0 can be updated to tag 2.0.0');
+});
+
+test('renderSimpleBody should omit watcher suffix when it matches the controller prefix', () => {
+  const { simplebody, ...rest } = configurationValid;
+  trigger.configuration = trigger.validateConfiguration(rest);
+  mockGetAgents.mockReturnValue([{ name: 'remote-1' }]);
+
+  expect(
+    trigger.renderSimpleBody({
+      name: 'nginx',
+      watcher: 'controller-host',
+      updateKind: {
+        kind: 'tag',
+        localValue: '1.0.0',
+        remoteValue: '2.0.0',
+      },
+    }),
+  ).toBe('[controller-host] Container nginx running with tag 1.0.0 can be updated to tag 2.0.0');
+
+  mockGetAgents.mockReturnValue([]);
+});
+
 test('renderBatchBody should include agent prefix per container in batch', () => {
   const { simplebody, ...rest } = configurationValid;
   trigger.configuration = trigger.validateConfiguration(rest);

app/triggers/providers/Trigger.ts

@@ -1602,11 +1602,28 @@ class Trigger extends Component {
    * Build the container template context used by trigger body/title rendering.
    * Release notes bodies are shortened for notifications to avoid excessively long payloads.
    */
-  private getNotificationWatcherSuffix(container: Container): string {
+  private getNotificationServerName(container: Container): string {
+    const agent = typeof container.agent === 'string' ? container.agent.trim() : '';
+    return agent || getServerName();
+  }
+
+  private getNotificationWatcherSuffix(
+    container: Container,
+    notificationAgentPrefix: string,
+    notificationServerName: string,
+  ): string {
     const watcher = typeof container.watcher === 'string' ? container.watcher.trim() : '';
     if (!watcher || watcher === 'local' || watcher === 'agent') {
       return '';
     }
+
+    if (
+      notificationAgentPrefix &&
+      watcher.toLowerCase() === notificationServerName.trim().toLowerCase()
+    ) {
+      return '';
+    }
+
     return ` (${watcher})`;
   }
 
@@ -1622,12 +1639,13 @@ class Trigger extends Component {
   }
 
   private getTemplateContainer(container: Container): TriggerTemplateContainer {
-    const notificationWatcherSuffix = this.getNotificationWatcherSuffix(container);
     const notificationAgentPrefix = this.getNotificationAgentPrefix(container);
-    const notificationServerName =
-      typeof container.agent === 'string' && container.agent.trim()
-        ? container.agent.trim()
-        : getServerName();
+    const notificationServerName = this.getNotificationServerName(container);
+    const notificationWatcherSuffix = this.getNotificationWatcherSuffix(
+      container,
+      notificationAgentPrefix,
+      notificationServerName,
+    );
     const releaseNotes = container.result?.releaseNotes;
     if (!releaseNotes || typeof releaseNotes.body !== 'string') {
       return {