fix: improve message handling and bus closure logic for better reliability

pkg/agent/loop.go

@@ -251,9 +251,11 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 		select {
 		case <-ctx.Done():
 			return nil
-		case msg := <-al.bus.InboundChan():
+		case msg, ok := <-al.bus.InboundChan():
+			if !ok {
+				return nil
+			}
 			// Process message
-			func() {
 			// TODO: Re-enable media cleanup after inbound media is properly consumed by the agent.
 			// Currently disabled because files are deleted before the LLM can access their content.
 			// defer func() {
@@ -306,8 +308,8 @@ func (al *AgentLoop) Run(ctx context.Context) error {
 					)
 				}
 			}
-			}()
 		default:
+			time.Sleep(time.Second * 5)
 		}
 	}
 

pkg/bus/bus.go

@@ -88,11 +88,13 @@ func (mb *MessageBus) OutboundMediaChan() <-chan OutboundMediaMessage {
 
 func (mb *MessageBus) Close() {
 	mb.closeOnce.Do(func() {
-		mb.closed.Store(true)
-
 		// notify all blocked publishers to exit
 		close(mb.done)
 
+		// because every publisher will check mb.closed before acquiring wg
+		// so we can be sure that new publishers will not be added new messages after this point
+		mb.closed.Store(true)
+
 		// wait for all ongoing Publish calls to finish, ensuring all messages have been sent to channels or exited
 		mb.wg.Wait()
 

pkg/channels/whatsapp_native/whatsapp_command_test.go

@@ -43,7 +43,11 @@ func TestHandleIncoming_DoesNotConsumeGenericCommandsLocally(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 
-	inbound, ok := messageBus.ConsumeInbound(ctx)
+	select {
+	case <-ctx.Done():
+		t.Fatal("timeout waiting for message to be forwarded")
+		return
+	case inbound, ok := <-messageBus.InboundChan():
 		if !ok {
 			t.Fatal("expected inbound message to be forwarded")
 		}
@@ -54,3 +58,4 @@ func TestHandleIncoming_DoesNotConsumeGenericCommandsLocally(t *testing.T) {
 			t.Fatalf("content=%q", inbound.Content)
 		}
 	}
+}