rotor-framework 0.7.7 → 0.8.1

package/README.md

@@ -96,7 +96,7 @@ You can find [🌱](./docs/ai/readme.opt.yaml) symbols in all documentation page
 
 ## 📚 Learn More
 
-![Version](https://img.shields.io/badge/version-v0.7.7-blue?label=Documents%20TAG)
+![Version](https://img.shields.io/badge/version-v0.8.1-blue?label=Documents%20TAG)
 
 ### Framework Core
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rotor-framework",
-	"version": "0.7.7",
+	"version": "0.8.1",
 	"description": "Roku toolkit library providing a ViewBuilder, full UI lifecycle with focus handling and many core features, plus MVI-based state management.",
 	"author": "Balázs Molnár",
 	"license": "Apache-2.0",
@@ -52,8 +52,9 @@
 	},
 	"homepage": "https://github.com/mobalazs/rotor-framework#readme",
 	"devDependencies": {
-		"@rokucommunity/bslint": "^1.0.0-alpha.48",
-		"brighterscript": "^1.0.0-alpha.48",
-		"rooibos-roku": "file:./vendor/rooibos-roku-6.0.0-alpha.48-fixed354.tgz"
+		"@rokucommunity/bslint": "1.0.0-alpha.50",
+		"brighterscript": "1.0.0-alpha.50",
+		"roku-deploy": "^3.16.1",
+		"rooibos-roku": "6.0.0-alpha.50"
 	}
 }

package/src/source/RotorFramework.bs

@@ -4,7 +4,7 @@
 ' ▐▛▀▚▖▐▌ ▐▌ █ ▐▌ ▐▌▐▛▀▚▖    ▐▛▀▀▘▐▛▀▚▖▐▛▀▜▌▐▌  ▐▌▐▛▀▀▘▐▌ ▐▌▐▌ ▐▌▐▛▀▚▖▐▛▚▖
 ' ▐▌ ▐▌▝▚▄▞▘ █ ▝▚▄▞▘▐▌ ▐▌    ▐▌   ▐▌ ▐▌▐▌ ▐▌▐▌  ▐▌▐▙▄▄▖▐▙█▟▌▝▚▄▞▘▐▌ ▐▌▐▌ ▐▌
 ' Rotor Framework™
-' Version 0.7.7
+' Version 0.8.1
 ' © 2025-2026 Balázs Molnár — Apache License 2.0
 ' =========================================================================
 
@@ -86,7 +86,7 @@ namespace Rotor
     class Framework
 
         name = "Rotor Framework"
-        version = "0.7.7"
+        version = "0.8.1"
 
         config = {
             tasks: invalid, ' @array    (optional)
@@ -333,6 +333,20 @@ namespace Rotor
             return m.builder.nodePool.presetNodePool(config)
         end function
 
+        ' ---------------------------------------------------------------------
+        ' registerSourceObject - Not available on render thread
+        '
+        public sub registerSourceObject(objectId as string, dispatcherId as string, sourceObject as object, eventFilter = invalid as dynamic)
+            throw "registerSourceObject() is only available on the task thread. Source objects require a task thread message port for event routing."
+        end sub
+
+        ' ---------------------------------------------------------------------
+        ' unregisterSourceObject - Not available on render thread
+        '
+        public sub unregisterSourceObject(objectId as string)
+            throw "unregisterSourceObject() is only available on the task thread."
+        end sub
+
         ' =====================================================================
         ' INTERNAL METHODS - INITIALIZATION AND TASK SYNCING
         ' =====================================================================

package/src/source/RotorFrameworkTask.bs

@@ -4,7 +4,7 @@
 ' ▐▛▀▚▖▐▌ ▐▌ █ ▐▌ ▐▌▐▛▀▚▖    ▐▛▀▀▘▐▛▀▚▖▐▛▀▜▌▐▌  ▐▌▐▛▀▀▘▐▌ ▐▌▐▌ ▐▌▐▛▀▚▖▐▛▚▖
 ' ▐▌ ▐▌▝▚▄▞▘ █ ▝▚▄▞▘▐▌ ▐▌    ▐▌   ▐▌ ▐▌▐▌ ▐▌▐▌  ▐▌▐▙▄▄▖▐▙█▟▌▝▚▄▞▘▐▌ ▐▌▐▌ ▐▌
 ' Rotor Framework™
-' Version 0.7.7
+' Version 0.8.1
 ' © 2025-2026 Balázs Molnár — Apache License 2.0
 ' =========================================================================
 
@@ -70,7 +70,7 @@ namespace Rotor
     class FrameworkTask
 
         name = "Rotor Framework"
-        version = "0.7.7"
+        version = "0.8.1"
 
         config = {
             tasks: invalid, ' optional
@@ -86,8 +86,10 @@ namespace Rotor
         taskNode as object
         dispatcherProvider as object
         port as object
-        asyncTransferRegistry = {} ' transferId -> { dispatcherId, context }
-        deviceInfoRegistry = {} ' deviceInfoId -> { dispatcherId, context, deviceInfo }
+        sourceObjectRegistry = {} ' identity -> { dispatcherId, objectId, eventFilter }
+        sourceObjectIdIndex = {} ' objectId -> identity (reverse index for unregistration)
+        sourceObjectTypeRegistry = [] ' [{ dispatcherId, objectId, eventFilter }] - broadcast routing
+        private _eventFilterFn = invalid as dynamic
         onTick as function
 
         ' ---------------------------------------------------------------------
@@ -132,42 +134,59 @@ namespace Rotor
         end function
 
         ' ---------------------------------------------------------------------
-        ' registerAsyncTransfer - Registers an async transfer with dispatcher context
+        ' registerSourceObject - Registers a source object for event routing
         '
-        ' This method associates a roUrlTransfer identity with a dispatcher ID and
-        ' optional context data. When the transfer completes and sends a roUrlEvent,
-        ' the framework will route it to the correct dispatcher's asyncReducerCallback.
+        ' Generic registry for any Roku source object. Auto-detects routing mode:
+        '   - Identity-based: If sourceObject implements ifSourceIdentity, routes via
+        '     GetSourceIdentity() on the event (roUrlTransfer, roChannelStore).
+        '   - Broadcast: If sourceObject does NOT implement ifSourceIdentity, broadcasts
+        '     to all registered dispatchers (roDeviceInfo, roInput, roAppManager).
         '
-        ' @param {string} transferId - The transfer.GetIdentity().ToStr() value
-        ' @param {string} dispatcherId - Dispatcher ID that initiated the transfer
-        ' @param {object} context - Optional user data to pass back in callback
+        ' @param {string} objectId - Unique identifier for this registration
+        ' @param {string} dispatcherId - Dispatcher ID that will handle events
+        ' @param {object} sourceObject - The source object (SetMessagePort will be called)
+        ' @param {function} eventFilter - Optional filter function. Receives msg, returns boolean.
         '
-        public sub registerAsyncTransfer(transferId as string, dispatcherId as string, context = invalid as dynamic)
-            m.asyncTransferRegistry[transferId] = {
-                dispatcherId: dispatcherId,
-                context: context
-            }
+        public sub registerSourceObject(objectId as string, dispatcherId as string, sourceObject as object, eventFilter = invalid as dynamic)
+            sourceObject.SetMessagePort(m.port)
+            if FindMemberFunction(sourceObject, "GetIdentity") <> invalid
+                ' Identity-based routing
+                identity = sourceObject.GetIdentity().ToStr()
+                m.sourceObjectRegistry[identity] = {
+                    dispatcherId: dispatcherId,
+                    objectId: objectId,
+                    eventFilter: eventFilter
+                }
+                m.sourceObjectIdIndex[objectId] = identity
+            else
+                ' Broadcast routing
+                m.sourceObjectTypeRegistry.push({
+                    dispatcherId: dispatcherId,
+                    objectId: objectId,
+                    eventFilter: eventFilter
+                })
+            end if
         end sub
 
         ' ---------------------------------------------------------------------
-        ' registerDeviceInfo - Registers a roDeviceInfo for event listening
-        '
-        ' This method associates a roDeviceInfo object with a dispatcher ID.
-        ' When device info events occur (linkStatus, etc.), the framework will
-        ' route them to the correct dispatcher's asyncReducerCallback.
+        ' unregisterSourceObject - Unregisters a port-based object by its objectId
         '
-        ' @param {string} deviceInfoId - Unique identifier for this registration
-        ' @param {string} dispatcherId - Dispatcher ID that will handle events
-        ' @param {object} deviceInfo - The roDeviceInfo object (must have SetMessagePort called)
-        ' @param {object} context - Optional user data to pass back in callback
+        ' @param {string} objectId - The unique identifier used during registration
         '
-        public sub registerDeviceInfo(deviceInfoId as string, dispatcherId as string, deviceInfo as object, context = invalid as dynamic)
-            deviceInfo.SetMessagePort(m.port)
-            m.deviceInfoRegistry[deviceInfoId] = {
-                dispatcherId: dispatcherId,
-                deviceInfo: deviceInfo,
-                context: context
-            }
+        public sub unregisterSourceObject(objectId as string)
+            ' Try identity-based registry
+            if m.sourceObjectIdIndex.DoesExist(objectId)
+                identity = m.sourceObjectIdIndex[objectId]
+                m.sourceObjectRegistry.Delete(identity)
+                m.sourceObjectIdIndex.Delete(objectId)
+                return
+            end if
+            ' Try broadcast registry
+            for i = m.sourceObjectTypeRegistry.count() - 1 to 0 step -1
+                if m.sourceObjectTypeRegistry[i].objectId = objectId
+                    m.sourceObjectTypeRegistry.Delete(i)
+                end if
+            end for
         end sub
 
         ' ---------------------------------------------------------------------
@@ -241,53 +260,63 @@ namespace Rotor
 
                             end if
                         else
-
+                            ' Cross-thread state change: notify task-side listeners
                             data = msg.getData()
-                            extraInfo = msg.GetInfo() ' Info AA passed during observeFieldScoped
-
-                            if extraInfo?.dispatcherId <> invalid and m.dispatcherProvider.get(extraInfo?.dispatcherId) <> invalid
-                                ' Catch by dispatcherId
-                                m.dispatcherProvider.get(extraInfo?.dispatcherId).asyncReducerCallback(msg, extraInfo?.context as dynamic)
-                            else
-                                dispatcherId = fieldId
-                                dispatcherInstance = m.dispatcherProvider.get(dispatcherId)
+                            dispatcherId = fieldId
+                            dispatcherInstance = m.dispatcherProvider.get(dispatcherId)
+                            if dispatcherInstance <> invalid
                                 dispatcherInstance.notifyListeners(data)
                             end if
 
                         end if
-                    else if msgType = "roUrlEvent"
-                        ' Handle async transfer responses
-                        transferId = msg.GetSourceIdentity().ToStr()
-
-                        if m.asyncTransferRegistry.DoesExist(transferId)
-                            transferData = m.asyncTransferRegistry[transferId]
-                            dispatcherId = transferData.dispatcherId
-
-                            ' Cleanup registry entry (Note: order is important - this make it reusable immediately)
-                            m.asyncTransferRegistry.delete(transferId)
-
-                            dispatcherInstance = m.dispatcherProvider.get(dispatcherId)
-                            if dispatcherInstance <> invalid
-                                ' Route to dispatcher with wrapped message
-                                dispatcherInstance.asyncReducerCallback(msg as roUrlEvent, transferData?.context as dynamic)
-                            end if
+                    else
+                        ' Generic source object routing
+                        routed = false
+
+                        ' Try identity-based routing
+                        if m.sourceObjectRegistry.count() > 0
+                            try
+                                sourceIdentity = msg.GetSourceIdentity().ToStr()
+                                if m.sourceObjectRegistry.DoesExist(sourceIdentity)
+                                    entry = m.sourceObjectRegistry[sourceIdentity]
+
+                                    ' Apply event filter if provided
+                                    allowed = true
+                                    if entry.eventFilter <> invalid
+                                        m._eventFilterFn = entry.eventFilter
+                                        allowed = m._eventFilterFn(msg)
+                                    end if
 
+                                    if allowed
+                                        dispatcherInstance = m.dispatcherProvider.get(entry.dispatcherId)
+                                        if dispatcherInstance <> invalid
+                                            dispatcherInstance.onSourceEvent(msg)
+                                        end if
+                                    end if
+                                    routed = true
+                                end if
+                            catch e
+                                ' Event doesn't support GetSourceIdentity - fall through to broadcast
+                            end try
                         end if
-                    else if msgType = "roDeviceInfoEvent"
-                        ' Handle device info events (ignore appFocused, etc.)
-                        if m.deviceInfoRegistry.count() > 0
-                            eventInfo = msg.GetInfo()
-                            ' Only process linkStatus events, ignore appFocused and other events
-                            if eventInfo?.linkStatus <> invalid
-                                ' Route to all registered device info dispatchers
-                                for each deviceInfoId in m.deviceInfoRegistry
-                                    registryEntry = m.deviceInfoRegistry[deviceInfoId]
-                                    dispatcherInstance = m.dispatcherProvider.get(registryEntry.dispatcherId)
+
+                        ' Broadcast to all non-identity registered dispatchers
+                        if not routed
+                            for each entry in m.sourceObjectTypeRegistry
+                                ' Apply event filter if provided
+                                allowed = true
+                                if entry.eventFilter <> invalid
+                                    m._eventFilterFn = entry.eventFilter
+                                    allowed = m._eventFilterFn(msg)
+                                end if
+
+                                if allowed
+                                    dispatcherInstance = m.dispatcherProvider.get(entry.dispatcherId)
                                     if dispatcherInstance <> invalid
-                                        dispatcherInstance.asyncReducerCallback(eventInfo, registryEntry?.context as dynamic)
+                                        dispatcherInstance.onSourceEvent(msg)
                                     end if
-                                end for
-                            end if
+                                end if
+                            end for
                         end if
                     end if
                 end if
@@ -354,8 +383,9 @@ namespace Rotor
         ' Destroys dispatcher provider and clears global framework helper.
         '
         public sub destroy()
-            m.asyncTransferRegistry.clear()
-            m.deviceInfoRegistry.clear()
+            m.sourceObjectRegistry.clear()
+            m.sourceObjectIdIndex.clear()
+            m.sourceObjectTypeRegistry.clear()
             m.dispatcherProvider.destroy()
 
             globalScope = GetGlobalAA()

package/src/source/base/BaseReducer.bs

@@ -32,12 +32,12 @@ namespace Rotor
         dispatch as function            ' Dispatch intent to owner dispatcher
         dispatchTo as function          ' Dispatch intent to dispatcher by ID
         getStateFrom as function        ' Get state from dispatcher by ID
-        ownerDispatcher as object       ' Owning dispatcher instance
-        ownerDispatcherId as string     ' Owning dispatcher ID
+        dispatcher as object            ' Owning dispatcher instance
+        dispatcherId as string          ' Owning dispatcher ID
 
         ' Internal
         middlewareFnScoped as dynamic   ' Currently executing middleware
-
+        
         ' =============================================================
         ' CONSTRUCTOR
         ' =============================================================
@@ -56,12 +56,12 @@ namespace Rotor
 
             ' Inject dispatch method for dispatching intents
             m.dispatch = sub(intent as object)
-                m.ownerDispatcher.dispatch(intent)
+                m.dispatcher.dispatch(intent)
             end sub
 
             ' Inject getState method for accessing current state
             m.getState = function() as Rotor.Model
-                return m.ownerDispatcher.getState()
+                return m.dispatcher.getState()
             end function
 
             ' Inject dispatchTo method for dispatching intents to other dispatchers
@@ -105,6 +105,19 @@ namespace Rotor
             return state
         end function
 
+        ' ---------------------------------------------------------------------
+        ' onCreateDispatcher - Lifecycle hook called after dispatcher is fully registered
+        '
+        ' Called by the framework after the dispatcher is created and registered
+        ' with the DispatcherProvider. At this point, dispatcherId and all
+        ' framework integrations are available.
+        '
+        ' Override this method to perform initialization that requires
+        ' the dispatcher to be fully set up (e.g., source object registration).
+        '
+        sub onCreateDispatcher()
+        end sub
+
         ' =============================================================
         ' MIDDLEWARE
         ' =============================================================
@@ -174,34 +187,37 @@ namespace Rotor
         end function
 
         ' =============================================================
-        ' ASYNC TRANSFER SUPPORT
+        ' SOURCE OBJECT SUPPORT
         ' =============================================================
 
         ' ---------------------------------------------------------------------
-        ' registerAsyncTransfer - Registers a roUrlTransfer with the framework
-        '
-        ' Helper method to simplify async HTTP request tracking. Call this after
-        ' creating a roUrlTransfer but BEFORE calling AsyncGetToString() or other
-        ' async methods.
+        ' registerSourceObject - Registers a source object with the framework
         '
-        ' @param {object} transfer - The roUrlTransfer object
-        ' @param {object} context - Optional data to receive in asyncReducerCallback
+        ' Helper method for registering any Roku source object (roUrlTransfer,
+        ' roDeviceInfo, roChannelStore, etc.). The framework will call
+        ' SetMessagePort and route events to this reducer's onSourceEvent.
+        ' Routing mode is auto-detected: identity-based if sourceObject has GetIdentity(),
+        ' broadcast otherwise.
         '
-        ' Example:
-        '   transfer = CreateObject("roUrlTransfer")
-        '   transfer.SetUrl("https://api.example.com/data")
-        '   transfer.SetMessagePort(m.port)
-        '   m.registerAsyncTransfer(transfer, { userId: 123 })
-        '   transfer.AsyncGetToString()
+        ' @param {object} sourceObject - The source object
+        ' @param {function} eventFilter - Optional filter function. Receives msg, returns boolean.
         '
-        sub registerAsyncTransfer(transfer as object, context = invalid as dynamic)
+        sub registerSourceObject(sourceObject as object, eventFilter = invalid as dynamic)
             frameworkInstance = GetGlobalAA().rotor_framework_helper.frameworkInstance
-            transferId = transfer.GetIdentity().ToStr()
 
-            ' Only call if the method exists (task thread only)
-            if Rotor.Utils.isFunction(frameworkInstance?.registerAsyncTransfer)
-                frameworkInstance.registerAsyncTransfer(transferId, m.ownerDispatcherId, context)
-            end if
+            objectId = m.getSourceObjectId(sourceObject)
+            frameworkInstance.registerSourceObject(objectId, m.dispatcherId, sourceObject, eventFilter)
+        end sub
+
+        ' ---------------------------------------------------------------------
+        ' unregisterSourceObject - Unregisters a source object from the framework
+        '
+        ' @param {object} sourceObject - The source object to unregister
+        '
+        sub unregisterSourceObject(sourceObject as object)
+            frameworkInstance = GetGlobalAA().rotor_framework_helper.frameworkInstance
+            objectId = m.getSourceObjectId(sourceObject)
+            frameworkInstance.unregisterSourceObject(objectId)
         end sub
 
         ' =============================================================
@@ -209,11 +225,28 @@ namespace Rotor
         ' =============================================================
 
         ' ---------------------------------------------------------------------
-        ' asyncReducerCallback - Callback for async middleware operations
+        ' getSourceObjectId - Generates unique objectId for a source object
+        '
+        ' Identity-based objects (roUrlTransfer, etc.): dispatcherId + GetIdentity()
+        ' Broadcast objects (roDeviceInfo, etc.): dispatcherId + type name
+        '
+        ' @param {object} sourceObject - The source object
+        ' @returns {string} Unique objectId
+        '
+        private function getSourceObjectId(sourceObject as object) as string
+            if FindMemberFunction(sourceObject, "GetIdentity") <> invalid
+                return `${m.dispatcherId}_${sourceObject.GetIdentity()}`
+            else
+                return `${m.dispatcherId}_${type(sourceObject)}`
+            end if
+        end function
+
+        ' ---------------------------------------------------------------------
+        ' onSourceEvent - Callback for source object events
         '
-        ' @param {object} msg - Message from async operation
+        ' @param {object} msg - Raw message from source object (roUrlEvent, roDeviceInfoEvent, etc.)
         '
-        sub asyncReducerCallback(msg as roUrlEvent, context as dynamic)
+        sub onSourceEvent(msg as object)
             ' Override in subclass to handle async responses
         end sub
 
@@ -225,7 +258,7 @@ namespace Rotor
         ' destroy - Cleans up reducer references
         '
         sub destroy()
-            m.ownerDispatcher = invalid
+            m.dispatcher = invalid
             m.port = invalid
         end sub
 

package/src/source/base/BaseViewModel.bs

@@ -82,8 +82,6 @@ namespace Rotor
         ' Called automatically when setProps() is invoked.
         '
         sub onUpdateView()
-            ' Re-render template
-            m.render()
         end sub
 
         ' ---------------------------------------------------------------------

package/src/source/base/DispatcherCore.bs

@@ -69,11 +69,12 @@ namespace Rotor
         ' @param {object} state - New state to notify listeners about
         '
         sub notifyListeners(state as object)
-            listenerCount = m.listeners.Count()
             listenerIndex = 0
 
             ' Iterate through all listeners
-            while listenerIndex < listenerCount
+            ' Use m.listeners.Count() directly (not cached) to handle external listener
+            ' removal during iteration (e.g., ViewModel destroyed in a callback)
+            while listenerIndex < m.listeners.Count()
                 listener = m.listeners[listenerIndex]
                 scope = listener.listenerScope
 
@@ -116,7 +117,6 @@ namespace Rotor
                         listener.listenerScope = invalid
                         listener.callback = invalid
                         m.listeners.Delete(listenerIndex)
-                        listenerCount--
                     else
                         listenerIndex++
                     end if

package/src/source/base/DispatcherOriginal.bs

@@ -62,8 +62,8 @@ namespace Rotor
 
             ' Link reducer to this dispatcher
             m.reducerInstance = reducerInstance
-            m.reducerInstance.ownerDispatcher = m
-            m.reducerInstance.ownerDispatcherId = dispatcherId
+            m.reducerInstance.dispatcher = m
+            m.reducerInstance.dispatcherId = dispatcherId
             m.modelInstance = modelInstance
 
             ' Create field on task node for render thread communication
@@ -75,6 +75,10 @@ namespace Rotor
             ' Register with dispatcher provider
             dispatcherProvider = globalScope.rotor_framework_helper.frameworkInstance.dispatcherProvider
             dispatcherProvider.registerDispatcher(m, dispatcherId)
+
+            ' Lifecycle hook - called after dispatcher is fully registered
+            m.reducerInstance.onCreateDispatcher()
+
         end sub
 
         ' =============================================================
@@ -155,12 +159,12 @@ namespace Rotor
         ' =============================================================
 
         ' ---------------------------------------------------------------------
-        ' asyncReducerCallback - Routes async callback to reducer
+        ' onSourceEvent - Routes async callback to reducer
         '
         ' @param {object} msg - Message from async operation
         '
-        sub asyncReducerCallback(msg as roUrlEvent, context as dynamic)
-            m.reducerInstance.asyncReducerCallback(msg as roUrlEvent, context as dynamic)
+        sub onSourceEvent(msg as object)
+            m.reducerInstance.onSourceEvent(msg)
         end sub
 
         ' =============================================================

package/src/source/engine/builder/WidgetCreate.bs

@@ -97,7 +97,7 @@ namespace Rotor.ViewBuilder
         end function
 
         ' render - Renders widget updates (self, descendants, or children) *'
-        widget.render = sub(payloads as dynamic, params = {} as object)
+        widget.render = sub(payloads = invalid as dynamic, params = {} as object)
             if payloads = invalid and m.isViewModel = true
                 ' Self update (only for viewModels)
                 payloads = m.template()

package/src/source/engine/services/Tts.bs

@@ -264,15 +264,6 @@ namespace Rotor.ViewBuilder
             ' Apply threshold to ALL speech (both flush=true and flush=false)
             ' This prevents rapid interruptions from focus changes (e.g., "Home Home Home")
             ' If new request comes within 300ms, replace pending (filter rapid changes)
-            #if debug
-                if m.pendingSpeech <> invalid
-                    ' ? "[TTS_SERVICE][THRESHOLD] Replacing pending: '"; m.pendingSpeech.textToSpeak; "' with: '"; textToSpeak; "'"
-                else
-                    flushLabel = ""
-                    if shouldFlush then flushLabel = " (will flush)"
-                    ' ? "[TTS_SERVICE][THRESHOLD] Pending: '"; textToSpeak; "' ("; m.debounceDelay; "ms)"; flushLabel
-                end if
-            #end if
             m.pendingSpeech = {
                 textToSpeak: textToSpeak,
                 shouldFlush: shouldFlush,

package/src/source/plugins/FieldsPlugin.bs

@@ -149,6 +149,9 @@ namespace Rotor
                             ' Resolve value from key path
                             asset = Rotor.Utils.getValueByKeyPath(source, matchKey)
 
+                            ' Skip unresolved keys (e.g. @ in email addresses)
+                            if asset = invalid then goto nextResult
+
                             ' Handle string vs non-string results
                             if Rotor.Utils.isString(asset)
                                 ' String interpolation - replace in original string

package/src/source/plugins/FocusPlugin.bs

@@ -1154,8 +1154,6 @@ namespace Rotor
                     if not isGroup and candidate.isEnabled = false then continue for
 
                     candidateMetrics = candidate.refreshBounding()
-                    candidateLeft = candidateMetrics.segments[Rotor.Const.Segment.LEFT]
-                    candidateTop = candidateMetrics.segments[Rotor.Const.Segment.TOP]
                     ' Pass appropriate reference segments based on direction
                     if direction = "left" or direction = "right"
                         result = validator(candidateMetrics.segments, refSegmentLeft, refSegmentRight)
@@ -1237,7 +1235,7 @@ namespace Rotor
                 foundHID = ""
                 for each HID in possibleFocusItems
                     focusItem = m.get(HID)
-                    if focusItem.id = nodeId
+                    if focusItem?.id = nodeId
                         foundHID = focusItem.HID
                         exit for
                     end if
@@ -1539,33 +1537,28 @@ namespace Rotor
                 if defaultFocusId <> ""
                     focusItemsHIDlist = m.getGroupMembersHIDs()
                     if focusItemsHIDlist.Count() > 0
-
                         ' Try find valid HID in focusItems by node id
                         focusItemHID = m.findHIDinFocusItemsByNodeId(defaultFocusId, focusItemsHIDlist)
                         if focusItemHID <> ""
-                            HID = focusItemHID
+                            return focusItemHID
                         end if
-
-                    else
-
-                        return defaultFocusId
-
                     end if
+                    ' If not found as focusItem, return defaultFocusId string
+                    ' so capturingFocus_recursively can try to resolve it as a group
+                    return defaultFocusId
                 end if
 
                 return HID
             end function
 
             function findHIDinFocusItemsByNodeId(nodeId as string, focusItemsHIDlist as object) as string
-                HID = ""
-                for each HID in focusItemsHIDlist
-                    focusItem = m.focusItemsRef.get(HID)
+                for each itemHID in focusItemsHIDlist
+                    focusItem = m.focusItemsRef.get(itemHID)
                     if focusItem <> invalid and focusItem.id = nodeId
-                        HID = focusItem.HID
-                        exit for
+                        return focusItem.HID
                     end if
                 end for
-                return HID
+                return ""
             end function
 
             sub applyFocus(isFocused as boolean)
@@ -1574,7 +1567,7 @@ namespace Rotor
                 m.isFocused = isFocused
 
                 if m.autoSetIsFocusedState
-                    m.widget.viewModelState.isInFocusChain = isFocused
+                    m.widget.viewModelState.isFocused = isFocused
                 end if
                 m.node.setField("isFocused", isFocused)
                 m.callOnFocusedFnOnWidget(isFocused)

package/src/source/plugins/ObserverPlugin.bs

@@ -34,56 +34,36 @@ namespace Rotor
         sub new(pluginKey = "observer" as string)
             super()
             m.pluginKey = pluginKey
-        end sub
-
-        ' =============================================================
-        ' LIFECYCLE HOOKS
-        ' =============================================================
-
-        hooks = {
-            ' ---------------------------------------------------------------------
-            ' beforeMount - Attaches observers when widget is mounted
-            '
-            ' Called during widget creation to register all observers defined in the widget config.
-            '
-            ' @param {object} scope - Plugin instance (m)
-            ' @param {object} widget - Widget being mounted
-            '
-            beforeMount: sub(scope as object, widget as object)
-                config = widget[scope.pluginKey]
-                scope.attach(widget.node, config, widget)
-            end sub,
 
-            ' ---------------------------------------------------------------------
-            ' beforeUpdate - Updates observers when widget config changes
-            '
-            ' Detaches old observers and attaches new ones based on updated configuration.
+            ' WORKAROUND: Hooks must be assigned here in the constructor body
+            ' (after super()), NOT as a class-level field initializer.
             '
-            ' @param {object} scope - Plugin instance (m)
-            ' @param {object} widget - Widget being updated
-            ' @param {object} newValue - New observer configuration
-            ' @param {object} oldValue - Previous observer configuration
+            ' Rooibos code coverage instrumentation (tested up to v6.0.0-alpha.50)
+            ' reorders the compiled constructor so that class-level field initializers
+            ' are placed BEFORE the super() call. Since BasePlugin's constructor sets
+            ' m.hooks = invalid, this causes the parent to overwrite the hooks AA that
+            ' was already set by the field initializer.
             '
-            beforeUpdate: sub(scope as object, widget as object, newValue, oldValue = {})
-                if oldValue <> invalid
+            ' Only affects classes with an explicit sub new() + super() AND
+            ' class-level field initializers. Other plugins (FieldsPlugin, FocusPlugin,
+            ' etc.) are not affected because they have no explicit constructor.
+            m.hooks = {
+                beforeMount: sub(scope as object, widget as object)
+                    config = widget[scope.pluginKey]
+                    scope.attach(widget.node, config, widget)
+                end sub,
+                beforeUpdate: sub(scope as object, widget as object, newValue, oldValue = {})
+                    if oldValue <> invalid
+                        scope.detach(widget.node)
+                    end if
+                    widget[scope.pluginKey] = newValue
+                    scope.attach(widget.node, newValue, widget)
+                end sub,
+                beforeDestroy: sub(scope as object, widget as object)
                     scope.detach(widget.node)
-                end if
-                widget[scope.pluginKey] = newValue
-                scope.attach(widget.node, newValue, widget)
-            end sub,
-
-            ' ---------------------------------------------------------------------
-            ' beforeDestroy - Detaches all observers before widget destruction
-            '
-            ' Ensures cleanup of all observers when widget is removed from scene graph.
-            '
-            ' @param {object} scope - Plugin instance (m)
-            ' @param {object} widget - Widget being destroyed
-            '
-            beforeDestroy: sub(scope as object, widget as object)
-                scope.detach(widget.node)
-            end sub
-        }
+                end sub
+            }
+        end sub
 
         ' =============================================================
         ' INITIALIZATION
@@ -405,7 +385,7 @@ namespace Rotor
         ' Represents a single observer configuration for a node field.
         '
         ' Responsibilities:
-        '   - Stores observer configuration (callback, conditions, etc.)
+        '   - Stores observer configuration (callback or handler, conditions, etc.)
         '   - Sets up initial field value if provided
         '   - Provides info fields for observeFieldScoped
         '   - Executes callbacks in correct scope
@@ -427,7 +407,8 @@ namespace Rotor
             value as dynamic            ' Initial field value (if any)
             once as boolean             ' Remove observer after first trigger
             until as function           ' Conditional removal function
-            callback as function        ' Callback function to execute
+            callback as dynamic         ' Callback function called WITH payload (mutually exclusive with handler)
+            handler as dynamic          ' Handler function called WITHOUT arguments (mutually exclusive with callback)
             parsePayload as function    ' Payload transformation function
             alwaysNotify as boolean     ' Field alwaysNotify flag
 
@@ -462,9 +443,13 @@ namespace Rotor
                 m.once = config?.once ?? false
                 m.until = config?.until
 
-                ' Set callback (required)
-                m.callback = config?.callback ?? sub() throw "Callback has not configured for observer"
-                end Sub
+                ' Set callback or handler (one required, mutually exclusive)
+                m.callback = config?.callback
+                m.handler = config?.handler
+
+                if m.callback = invalid and m.handler = invalid
+                    throw "Observer requires either 'callback' or 'handler' configuration"
+                end if
 
                 ' Set payload parser (optional)
                 m.parsePayload = config?.parsePayload ?? function(payload)
@@ -518,14 +503,19 @@ namespace Rotor
             ' =============================================================
 
             ' ---------------------------------------------------------------------
-            ' notify - Executes observer callback
+            ' notify - Executes observer callback or handler
             '
-            ' Calls the configured callback function in the correct scope with the payload.
+            ' Calls the configured callback (with payload) or handler (without arguments)
+            ' in the correct widget scope.
             '
-            ' @param {dynamic} payload - Data to pass to callback
+            ' @param {dynamic} payload - Data to pass to callback (ignored for handler)
             '
             sub notify(payload as dynamic)
-                Rotor.Utils.callbackScoped(m.callback, m.listenerScope, payload)
+                if m.handler <> invalid
+                    Rotor.Utils.callbackScoped(m.handler, m.listenerScope)
+                else
+                    Rotor.Utils.callbackScoped(m.callback, m.listenerScope, payload)
+                end if
             end sub
 
             ' =============================================================