fix(notifications): address new bot review feedback

- notification.go: use composite "branchID/configID" key in configsByKey
  map to prevent collisions when two branches share the same config ID;
  also collect branch.id filter value alongside job.configuration.id
  before doing the lookup, require both for a correct match

- push.go: add nil guard for v.Remote in parentExists() before
  dereferencing the NotificationState's Remote pointer

- generator.go: remove spurious trailing quote from NotificationPath
  panic message

- mapper.go: correct LocalSaveMapper comment — parent-child manifest
  relationships (ConfigManifest.Notifications) are populated by
  setRecords() during manifest load, not by MapBeforeLocalSave

- CLI_CONTEXT.md: fix two inaccuracies — notifications are stored in
  config.json (not meta.json), and filter operators are ==, !=, >, <,
  >=, <= (not eq, ne, gt, lt, ge, le)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Matovidlo

internal/pkg/mapper/mapper.go

@@ -12,9 +12,9 @@ import (
 // LocalSaveMapper is intended to modify how the object will be saved in the filesystem.
 // If you need a list of all saved objects, when they are already saved, use the AfterLocalOperationListener instead.
 //
-// IMPORTANT for parent-child relationships (e.g., Config → Notifications):
-// MapBeforeLocalSave is where you should populate parent manifest relationships like ConfigManifest.Notifications.
-// Do NOT populate these in remote load - let the mapper control how objects are grouped and saved.
+// Note: parent-child manifest relationships (e.g., ConfigManifest.Notifications) are populated
+// automatically by setRecords() during manifest loading, not by this mapper.
+// MapBeforeLocalSave is used to write object files (config.json, meta.json, etc.) to the filesystem.
 // See docs/CLI_OBJECT_LIFECYCLE.md for the complete flow.
 type LocalSaveMapper interface {
 	MapBeforeLocalSave(ctx context.Context, recipe *model.LocalSaveRecipe) error

internal/pkg/naming/generator.go

@@ -188,7 +188,7 @@ func (g Generator) ConfigRowPath(parentPath string, component *keboola.Component
 
 func (g Generator) NotificationPath(parentPath string, notification *model.Notification) model.AbsPath {
 	if len(parentPath) == 0 {
-		panic(errors.Errorf(`notification "%s" parent path cannot be empty"`, notification))
+		panic(errors.Errorf(`notification "%s" parent path cannot be empty`, notification))
 	}
 
 	p := model.AbsPath{}

internal/pkg/plan/push/push.go

@@ -51,6 +51,9 @@ func parentExists(objectState model.ObjectState, objects model.ObjectStates) boo
 		branch, branchFound := objects.Get(row.BranchKey())
 		return configFound && config.HasLocalState() && branchFound && branch.HasLocalState()
 	case *model.NotificationState:
+		if v.Remote == nil {
+			return false
+		}
 		notification := v.Remote
 		config, configFound := objects.Get(notification.ConfigKey())
 		branch, branchFound := objects.Get(notification.ConfigKey().BranchKey())

internal/pkg/service/cli/CLI_CONTEXT.md

@@ -4,13 +4,13 @@ This document provides architectural context for the Keboola CLI service (`kbc`)
 
 ## Notification Subscriptions
 
-The CLI supports managing notification subscriptions for configurations. Notifications are stored in `{config}/notifications/{subscription-id}/meta.json` files and tracked in the manifest.
+The CLI supports managing notification subscriptions for configurations. Notifications are stored in `{config}/notifications/{subscription-id}/config.json` files and tracked in the manifest.
 
 **Key Features:**
 - Config-level notifications (branch-level not yet supported)
 - Events: job-failed, job-succeeded, job-warning, job-processing-long
 - Channels: email or webhook
-- Filters: Fine-grained control with operators (eq, ne, gt, lt, ge, le)
+- Filters: Fine-grained control with operators (==, !=, >, <, >=, <=)
 - Full pull/push/sync support
 
 **Operations:**

internal/pkg/state/remote/notification.go

@@ -2,6 +2,7 @@ package remote
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/keboola/keboola-sdk-go/v2/pkg/keboola"
@@ -22,29 +23,42 @@ func (u *UnitOfWork) loadNotifications(ctx context.Context) error {
 		return err
 	}
 
-	// Build map of config ID -> config manifest for quick lookup
-	configsByID := make(map[keboola.ConfigID]*model.ConfigManifest)
+	// Build map of "branchID/configID" -> config manifest for collision-safe lookup
+	configsByKey := make(map[string]*model.ConfigManifest)
 	for _, record := range u.Manifest().All() {
 		if configManifest, ok := record.(*model.ConfigManifest); ok {
-			configsByID[configManifest.ID] = configManifest
+			key := fmt.Sprintf("%d/%s", configManifest.BranchID, configManifest.ID)
+			configsByKey[key] = configManifest
 		}
 	}
 
 	// Load each notification from API
 	for _, apiSub := range *subscriptions {
-		// Find which config this notification belongs to by checking filters
-		var parentConfig *model.ConfigManifest
+		// Collect branch.id and job.configuration.id from equality filters
+		var branchIDStr, configIDStr string
 		for _, filter := range apiSub.Filters {
-			if filter.Field == "job.configuration.id" && filter.Operator == keboola.NotificationFilterOperatorEquals {
-				// Found the config ID equality filter - look up the config
-				configID := keboola.ConfigID(filter.Value)
-				if cfg, found := configsByID[configID]; found {
-					parentConfig = cfg
-					break
-				}
+			if filter.Operator != keboola.NotificationFilterOperatorEquals {
+				continue
+			}
+			switch filter.Field {
+			case "branch.id":
+				branchIDStr = filter.Value
+			case "job.configuration.id":
+				configIDStr = filter.Value
 			}
 		}
 
+		// Skip if no config ID filter present
+		if configIDStr == "" {
+			continue
+		}
+
+		// Look up config using composite key to avoid branch collisions
+		var parentConfig *model.ConfigManifest
+		if branchIDStr != "" {
+			parentConfig = configsByKey[branchIDStr+"/"+configIDStr]
+		}
+
 		// Skip if we don't have this config locally
 		if parentConfig == nil {
 			continue