From d8fb2e75afcc44ab0aaa5f9adb0f27070a70069f Mon Sep 17 00:00:00 2001
From: LukeGus <bugattiguy527@gmail.com>
Date: Wed, 30 Sep 2026 14:45:18 -0500
Subject: [PATCH] fix: show the remote desktop note under connection origin
 again

---
 packages/plugin-sdk/src/frontend.ts           |  2 ++
 plugins/remote-desktop/locales/en.json        |  3 ++-
 plugins/remote-desktop/src/frontend/index.tsx |  1 +
 src/ui/plugin-host/app.ts                     |  3 +++
 src/ui/sidebar/HostEditorGeneralTab.tsx       | 13 ++++++++++++-
 src/ui/sidebar/host-protocols.ts              |  1 +
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/plugin-sdk/src/frontend.ts b/packages/plugin-sdk/src/frontend.ts
index bca0c6734..5c93482e0 100644
--- a/packages/plugin-sdk/src/frontend.ts
+++ b/packages/plugin-sdk/src/frontend.ts
@@ -492,6 +492,8 @@ export interface HostProtocolContribution {
   defaultPort: number;
   titleKey: string;
   descriptionKey?: string;
+  /** Added to the host editor's connection origin help while the protocol is on. */
+  connectionOriginNoteKey?: string;
   icon: IconComponent;
   order?: number;
   /** Offer it in Quick Connect, optionally with a domain field. */
diff --git a/plugins/remote-desktop/locales/en.json b/plugins/remote-desktop/locales/en.json
index 0cb1161b4..74f60567e 100644
--- a/plugins/remote-desktop/locales/en.json
+++ b/plugins/remote-desktop/locales/en.json
@@ -220,7 +220,8 @@
     "remoteDesktopNotes": "Notes",
     "userDefaultsNote": "Settings left on their default use your Remote Desktop defaults from Settings.",
     "connectionOriginNote": "On the desktop app, RDP, VNC and Telnet use the remote server unless the host is set to This device, which needs a guacd this machine can reach. Set one in the Remote Desktop settings, or per host under guacd Proxy.",
-    "docsLink": "View docs"
+    "docsLink": "View docs",
+    "connectionOriginGuacamoleNote": "RDP, VNC and Telnet use the remote server unless you pick \"This device\", which needs a guacd this machine can reach. Set one in the guacd URL setting, or per host under guacd Proxy."
   },
   "onboarding": {
     "feature_desktop": "Remote desktop",
diff --git a/plugins/remote-desktop/src/frontend/index.tsx b/plugins/remote-desktop/src/frontend/index.tsx
index 8bbc2fb62..227fe35c6 100644
--- a/plugins/remote-desktop/src/frontend/index.tsx
+++ b/plugins/remote-desktop/src/frontend/index.tsx
@@ -328,6 +328,7 @@ function registerHostSurfaces(app: TermixApp): void {
       defaultPort: DEFAULT_PORT[protocol.id],
       titleKey: protocol.titleKey,
       descriptionKey: protocol.descriptionKey,
+      connectionOriginNoteKey: "hosts.connectionOriginGuacamoleNote",
       icon: protocol.icon,
       order: protocol.order,
       quickConnect: protocol.quickConnect,
diff --git a/src/ui/plugin-host/app.ts b/src/ui/plugin-host/app.ts
index fbda76dc4..5ca105b9a 100644
--- a/src/ui/plugin-host/app.ts
+++ b/src/ui/plugin-host/app.ts
@@ -284,6 +284,9 @@ export function createPluginApp(
           descriptionKey: protocol.descriptionKey
             ? key(protocol.descriptionKey)
             : undefined,
+          connectionOriginNoteKey: protocol.connectionOriginNoteKey
+            ? key(protocol.connectionOriginNoteKey)
+            : undefined,
         }),
       );
     },
diff --git a/src/ui/sidebar/HostEditorGeneralTab.tsx b/src/ui/sidebar/HostEditorGeneralTab.tsx
index cdf56847b..fe678a2c5 100644
--- a/src/ui/sidebar/HostEditorGeneralTab.tsx
+++ b/src/ui/sidebar/HostEditorGeneralTab.tsx
@@ -737,7 +737,18 @@ export function HostEditorGeneralTab({
             <HostOnly>
               <SettingRow
                 label={t("hosts.connectionOrigin")}
-                description={t("hosts.connectionOriginDesc")}
+                description={[
+                  t("hosts.connectionOriginDesc"),
+                  ...new Set(
+                    pluginProtocols
+                      .filter(
+                        (protocol) =>
+                          protocols[protocol.settingKey] &&
+                          protocol.connectionOriginNoteKey,
+                      )
+                      .map((protocol) => t(protocol.connectionOriginNoteKey!)),
+                  ),
+                ].join(" ")}
               >
                 <select
                   className="flex h-7 border border-border bg-background px-2 py-0 text-xs outline-none focus:ring-1 focus:ring-ring"
diff --git a/src/ui/sidebar/host-protocols.ts b/src/ui/sidebar/host-protocols.ts
index 66755770d..39e152871 100644
--- a/src/ui/sidebar/host-protocols.ts
+++ b/src/ui/sidebar/host-protocols.ts
@@ -18,6 +18,7 @@ export interface HostProtocolDef {
   defaultPort: number;
   titleKey: string;
   descriptionKey?: string;
+  connectionOriginNoteKey?: string;
   icon: Icon;
   order?: number;
   /** Offer it in Quick Connect, optionally with a domain field. */