From b78cd1ce40fc2868320394656c5155c2f234a2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Almeida?=
 <57680069+zeval@users.noreply.github.com>
Date: Tue, 21 Jul 2026 16:32:55 +0100
Subject: [PATCH] fix(settings): order plugins before system (#1844)

---
 .../settings/settings-tree-render.test.tsx     | 18 +++++++++++++++++-
 .../sections/settings/settings-tree.tsx        |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/web/components/app-sidebar/sections/settings/settings-tree-render.test.tsx b/apps/web/components/app-sidebar/sections/settings/settings-tree-render.test.tsx
index 8939d9f4bc..33d75946c8 100644
--- a/apps/web/components/app-sidebar/sections/settings/settings-tree-render.test.tsx
+++ b/apps/web/components/app-sidebar/sections/settings/settings-tree-render.test.tsx
@@ -222,7 +222,10 @@ describe("SettingsTree integration status", () => {
 });
 
 describe("SettingsTree standalone leaves", () => {
-  afterEach(() => cleanup());
+  afterEach(() => {
+    cleanup();
+    state.features.plugins = false;
+  });
 
   it("keeps Voice Mode in the settings tree as a standalone active leaf", () => {
     render(<SettingsTree pathname="/settings" />);
@@ -240,6 +243,19 @@ describe("SettingsTree standalone leaves", () => {
     );
     expect(screen.queryByRole("link", { name: "Appearance" })).toBeNull();
   });
+
+  it("puts Plugins immediately before System when plugins are enabled", () => {
+    state.features.plugins = true;
+
+    render(<SettingsTree pathname="/settings" />);
+
+    expect(
+      screen
+        .getAllByRole("link")
+        .slice(-2)
+        .map((link) => link.textContent),
+    ).toEqual(["Plugins", "System"]);
+  });
 });
 
 describe("WorkspacesGroup active workspace presentation", () => {
diff --git a/apps/web/components/app-sidebar/sections/settings/settings-tree.tsx b/apps/web/components/app-sidebar/sections/settings/settings-tree.tsx
index 3e476bd22c..995a8a92d4 100644
--- a/apps/web/components/app-sidebar/sections/settings/settings-tree.tsx
+++ b/apps/web/components/app-sidebar/sections/settings/settings-tree.tsx
@@ -108,7 +108,7 @@ export function SettingsTree({ pathname }: { pathname: string }) {
         icon={IconPlugConnected}
         isActive={pathname === EXT_MCP_HREF}
       />
-      <SystemGroup pathname={pathname} {...groupProps("system")} />
+      <PluginSlot name="settings-nav" />
       {pluginsEnabled && (
         <SettingsLeaf
           href={PLUGINS_HREF}
@@ -117,7 +117,7 @@ export function SettingsTree({ pathname }: { pathname: string }) {
           isActive={pathname === PLUGINS_HREF}
         />
       )}
-      <PluginSlot name="settings-nav" />
+      <SystemGroup pathname={pathname} {...groupProps("system")} />
     </>
   );
 }