diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
index d403e8a3..3c2e5736 100644
--- a/plugin/META-INF/MANIFEST.MF
+++ b/plugin/META-INF/MANIFEST.MF
@@ -59,6 +59,7 @@ Bundle-Classpath: target/classes/,
target/dependency/regions-2.28.26.jar,
target/dependency/retries-2.28.26.jar,
target/dependency/retries-spi-2.28.26.jar,
+ target/dependency/rxjava-1.3.8.jar,
target/dependency/sdk-core-2.28.26.jar,
target/dependency/third-party-jackson-core-2.28.26.jar,
target/dependency/utils-2.28.26.jar
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 16f296c7..bc641592 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -71,6 +71,11 @@
cognitoidentity
${aws.java.sdk.version}
+
+ io.reactivex
+ rxjava
+ 1.3.8
+
software.amazon.awssdk
auth
@@ -134,7 +139,7 @@
${project.build.directory}/dependency
- software.amazon.awssdk,com.fasterxml.jackson,com.nimbusds,jakarta.inject,commons-codec,org.apache.httpcomponents,org.reactivestreams
+ io.reactivex,software.amazon.awssdk,com.fasterxml.jackson,com.nimbusds,jakarta.inject,commons-codec,org.apache.httpcomponents,org.reactivestreams
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/broker/EventBroker.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/broker/EventBroker.java
new file mode 100644
index 00000000..d0d4fa45
--- /dev/null
+++ b/plugin/src/software/aws/toolkits/eclipse/amazonq/broker/EventBroker.java
@@ -0,0 +1,35 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.eclipse.amazonq.broker;
+
+import rx.Observable;
+import rx.Observer;
+import rx.subjects.PublishSubject;
+
+public final class EventBroker {
+
+ private static final EventBroker INSTANCE;
+ private final PublishSubject