From cd9736f7adec2a356b16c9cbdec86f71594dc333 Mon Sep 17 00:00:00 2001
From: Rohit Amarnath <88762+ramarnat@users.noreply.github.com>
Date: Sat, 21 Feb 2026 17:56:04 -0500
Subject: [PATCH] resolve conflicts

---
 src/auto-reply/reply/route-reply.test.ts | 1 +
 src/gateway/server-plugins.test.ts       | 1 +
 src/gateway/test-helpers.mocks.ts        | 1 +
 src/plugins/loader.ts                    | 1 +
 src/test-utils/channel-plugins.ts        | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/auto-reply/reply/route-reply.test.ts b/src/auto-reply/reply/route-reply.test.ts
index ca369375870..eea2bc15004 100644
--- a/src/auto-reply/reply/route-reply.test.ts
+++ b/src/auto-reply/reply/route-reply.test.ts
@@ -67,6 +67,7 @@ const createRegistry = (channels: PluginRegistry["channels"]): PluginRegistry =>
   hooks: [],
   typedHooks: [],
   commands: [],
+  commandOptions: [],
   channels,
   providers: [],
   gatewayHandlers: {},
diff --git a/src/gateway/server-plugins.test.ts b/src/gateway/server-plugins.test.ts
index 7fb34ff5efc..27d2372ca38 100644
--- a/src/gateway/server-plugins.test.ts
+++ b/src/gateway/server-plugins.test.ts
@@ -16,6 +16,7 @@ const createRegistry = (diagnostics: PluginDiagnostic[]): PluginRegistry => ({
   typedHooks: [],
   channels: [],
   commands: [],
+  commandOptions: [],
   providers: [],
   gatewayHandlers: {},
   httpHandlers: [],
diff --git a/src/gateway/test-helpers.mocks.ts b/src/gateway/test-helpers.mocks.ts
index 19c6d2e91a4..a422644d97b 100644
--- a/src/gateway/test-helpers.mocks.ts
+++ b/src/gateway/test-helpers.mocks.ts
@@ -151,6 +151,7 @@ const createStubPluginRegistry = (): PluginRegistry => ({
   cliRegistrars: [],
   services: [],
   commands: [],
+  commandOptions: [],
   diagnostics: [],
 });
 
diff --git a/src/plugins/loader.ts b/src/plugins/loader.ts
index c60acba7396..3d3cf129542 100644
--- a/src/plugins/loader.ts
+++ b/src/plugins/loader.ts
@@ -176,6 +176,7 @@ function createPluginRecord(params: {
     cliCommands: [],
     services: [],
     commands: [],
+    commandOptions: [],
     httpHandlers: 0,
     hookCount: 0,
     configSchema: params.configSchema,
diff --git a/src/test-utils/channel-plugins.ts b/src/test-utils/channel-plugins.ts
index 64e24deab52..6d2479c149e 100644
--- a/src/test-utils/channel-plugins.ts
+++ b/src/test-utils/channel-plugins.ts
@@ -25,6 +25,7 @@ export const createTestRegistry = (channels: TestChannelRegistration[] = []): Pl
   cliRegistrars: [],
   services: [],
   commands: [],
+  commandOptions: [],
   diagnostics: [],
 });