From 42c4241a8d4c0101e64420900d1c87acd1852300 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Mon, 19 Jan 2026 11:54:46 +0100 Subject: [PATCH] chore: remove key not needed --- internal/agent/tools/mcp/init.go | 4 ++-- internal/agent/tools/multiedit_test.go | 2 +- internal/app/app.go | 16 ++++++++-------- internal/app/lsp_events.go | 4 ++-- internal/permission/permission.go | 6 +++--- internal/permission/permission_test.go | 6 +++--- internal/pubsub/broker.go | 4 ++-- internal/pubsub/events.go | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/internal/agent/tools/mcp/init.go b/internal/agent/tools/mcp/init.go index 69b10f711c2d1fd247f95ed779be5d7a38ea3a7f..5064adc2e1bc665485f1fd96e5758cd2944c8b72 100644 --- a/internal/agent/tools/mcp/init.go +++ b/internal/agent/tools/mcp/init.go @@ -93,8 +93,8 @@ type ClientInfo struct { } // AddEventListener registers a callback for MCP events. -func AddEventListener(key string, fn func(pubsub.Event[Event])) { - broker.AddListener(key, fn) +func AddEventListener(fn func(pubsub.Event[Event])) { + broker.AddListener(fn) } // GetStates returns the current state of all MCP clients diff --git a/internal/agent/tools/multiedit_test.go b/internal/agent/tools/multiedit_test.go index 221d84a0afaa624b91a093de3935260c5006f400..6c61d691bdca606d22262330ca127b3eadf995ff 100644 --- a/internal/agent/tools/multiedit_test.go +++ b/internal/agent/tools/multiedit_test.go @@ -38,7 +38,7 @@ func (m *mockPermissionService) SkipRequests() bool { return false } -func (m *mockPermissionService) AddNotificationListener(key string, fn func(pubsub.Event[permission.PermissionNotification])) { +func (m *mockPermissionService) AddNotificationListener(fn func(pubsub.Event[permission.PermissionNotification])) { } type mockHistoryService struct { diff --git a/internal/app/app.go b/internal/app/app.go index c86bf3dd0266fe65c37b33768480bc0d5340cd54..498c81b44899bb47aff1eed22f2d37a2f1ae65bf 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -221,7 +221,7 @@ func (app *App) RunNonInteractive(ctx context.Context, output io.Writer, prompt ) // Register callback to process messages directly. - app.Messages.AddListener("non-interactive", func(event pubsub.Event[message.Message]) { + app.Messages.AddListener(func(event pubsub.Event[message.Message]) { msg := event.Payload if msg.SessionID != sess.ID || msg.Role != message.Assistant || len(msg.Parts) == 0 { return @@ -321,25 +321,25 @@ func (app *App) Subscribe(program *tea.Program) { app.program = program // Register listeners that send directly to the program. - app.Sessions.AddListener("tui-sessions", func(event pubsub.Event[session.Session]) { + app.Sessions.AddListener(func(event pubsub.Event[session.Session]) { program.Send(event) }) - app.Messages.AddListener("tui-messages", func(event pubsub.Event[message.Message]) { + app.Messages.AddListener(func(event pubsub.Event[message.Message]) { program.Send(event) }) - app.Permissions.AddListener("tui-permissions", func(event pubsub.Event[permission.PermissionRequest]) { + app.Permissions.AddListener(func(event pubsub.Event[permission.PermissionRequest]) { program.Send(event) }) - app.Permissions.AddNotificationListener("tui-permissions-notifications", func(event pubsub.Event[permission.PermissionNotification]) { + app.Permissions.AddNotificationListener(func(event pubsub.Event[permission.PermissionNotification]) { program.Send(event) }) - app.History.AddListener("tui-history", func(event pubsub.Event[history.File]) { + app.History.AddListener(func(event pubsub.Event[history.File]) { program.Send(event) }) - mcp.AddEventListener("tui-mcp", func(event pubsub.Event[mcp.Event]) { + mcp.AddEventListener(func(event pubsub.Event[mcp.Event]) { program.Send(event) }) - AddLSPEventListener("tui-lsp", func(event pubsub.Event[LSPEvent]) { + AddLSPEventListener(func(event pubsub.Event[LSPEvent]) { program.Send(event) }) } diff --git a/internal/app/lsp_events.go b/internal/app/lsp_events.go index d06d6fac3270f2483ef96b0147492938b30eb7b3..428cb0cc72ea749d93edbc61c02538181d1bb1d1 100644 --- a/internal/app/lsp_events.go +++ b/internal/app/lsp_events.go @@ -42,8 +42,8 @@ var ( ) // AddLSPEventListener registers a callback for LSP events. -func AddLSPEventListener(key string, fn func(pubsub.Event[LSPEvent])) { - lspBroker.AddListener(key, fn) +func AddLSPEventListener(fn func(pubsub.Event[LSPEvent])) { + lspBroker.AddListener(fn) } // GetLSPStates returns the current state of all LSP clients diff --git a/internal/permission/permission.go b/internal/permission/permission.go index 4dcf8a3b900dbdccce1301017a1e43aea5cc8fc9..e044e54bf03b8d1662341ffcfcd79a974678c602 100644 --- a/internal/permission/permission.go +++ b/internal/permission/permission.go @@ -51,7 +51,7 @@ type Service interface { AutoApproveSession(sessionID string) SetSkipRequests(skip bool) SkipRequests() bool - AddNotificationListener(key string, fn func(pubsub.Event[PermissionNotification])) + AddNotificationListener(fn func(pubsub.Event[PermissionNotification])) } type permissionService struct { @@ -222,8 +222,8 @@ func (s *permissionService) AutoApproveSession(sessionID string) { s.autoApproveSessionsMu.Unlock() } -func (s *permissionService) AddNotificationListener(key string, fn func(pubsub.Event[PermissionNotification])) { - s.notificationBroker.AddListener(key, fn) +func (s *permissionService) AddNotificationListener(fn func(pubsub.Event[PermissionNotification])) { + s.notificationBroker.AddListener(fn) } func (s *permissionService) SetSkipRequests(skip bool) { diff --git a/internal/permission/permission_test.go b/internal/permission/permission_test.go index 410ae97e0d7c6d57978aa2ae045f59b1b5e64270..72b0fb9e841c2a1a77446a69fc784f80a7ffb7d9 100644 --- a/internal/permission/permission_test.go +++ b/internal/permission/permission_test.go @@ -116,7 +116,7 @@ func TestPermissionService_SequentialProperties(t *testing.T) { wg.Add(1) events := make(chan pubsub.Event[PermissionRequest], 10) - service.AddListener("test", func(event pubsub.Event[PermissionRequest]) { + service.AddListener(func(event pubsub.Event[PermissionRequest]) { events <- event }) @@ -160,7 +160,7 @@ func TestPermissionService_SequentialProperties(t *testing.T) { } events := make(chan pubsub.Event[PermissionRequest], 10) - service.AddListener("test", func(event pubsub.Event[PermissionRequest]) { + service.AddListener(func(event pubsub.Event[PermissionRequest]) { events <- event }) var result1 bool @@ -194,7 +194,7 @@ func TestPermissionService_SequentialProperties(t *testing.T) { service := NewPermissionService("/tmp", false, []string{}) events := make(chan pubsub.Event[PermissionRequest], 10) - service.AddListener("test", func(event pubsub.Event[PermissionRequest]) { + service.AddListener(func(event pubsub.Event[PermissionRequest]) { events <- event }) diff --git a/internal/pubsub/broker.go b/internal/pubsub/broker.go index 4e5195ce5b1ef166ed211542f8387655910bf9f4..ca3774f23a1bd90ba95da9cef24c03442c3d0acd 100644 --- a/internal/pubsub/broker.go +++ b/internal/pubsub/broker.go @@ -19,10 +19,10 @@ func NewBroker[T any]() *Broker[T] { } // AddListener registers a callback for events. -func (b *Broker[T]) AddListener(key string, fn func(Event[T])) { +func (b *Broker[T]) AddListener(fn func(Event[T])) { b.signal.AddListener(func(_ context.Context, event Event[T]) { fn(event) - }, key) + }) } // Publish emits an event to all listeners without blocking. diff --git a/internal/pubsub/events.go b/internal/pubsub/events.go index ec0826fdcdb46c9ff249659f8d9206f1fa82d5f6..dc0f13a158a5a85b29f9d7e8e19f4bf49e162c8b 100644 --- a/internal/pubsub/events.go +++ b/internal/pubsub/events.go @@ -9,7 +9,7 @@ const ( ) type Subscriber[T any] interface { - AddListener(key string, fn func(Event[T])) + AddListener(fn func(Event[T])) } type (