Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix: scope plugin queries to the active backend (#16891)

alanhuangyoo91e4f98479c4
diff --git a/src/hooks/mutation/use-create-conversation.ts b/src/hooks/mutation/use-create-conversation.ts
index 71d38be357..cb62c8b9bf 100644
--- a/src/hooks/mutation/use-create-conversation.ts
+++ b/src/hooks/mutation/use-create-conversation.ts
@@ -261,7 +261,9 @@ export const useCreateConversation = () => {
let installed: InstalledPluginInfo[] = [];
try {
installed = await queryClient.ensureQueryData({
- queryKey: PLUGINS_QUERY_KEYS.installed,
+ // Same key `usePlugins` writes. Unscoped, this served the previous
+ // backend's list and attached plugins the target server lacks.
+ queryKey: [...PLUGINS_QUERY_KEYS.installed, backend.id, orgId],
queryFn: () => PluginsManagementService.listInstalledPlugins(),
});
} catch {
diff --git a/src/hooks/query/use-local-plugins.ts b/src/hooks/query/use-local-plugins.ts
index 5a3db52c15..7a8ad4a99a 100644
--- a/src/hooks/query/use-local-plugins.ts
+++ b/src/hooks/query/use-local-plugins.ts
@@ -1,4 +1,5 @@
import { useQuery } from "@tanstack/react-query";
+import { useActiveBackend } from "#/contexts/active-backend-context";
import PluginsService, { type LocalPlugin } from "#/api/plugins-service";
import { PLUGINS_QUERY_KEYS } from "./query-keys";
@@ -8,10 +9,13 @@ import { PLUGINS_QUERY_KEYS } from "./query-keys";
* cloud backend yields an empty list. Rendered as the read-only "Local" group on
* the Plugins page. Mirrors `usePlugins`.
*/
-export const useLocalPlugins = () =>
- useQuery<LocalPlugin[]>({
- queryKey: PLUGINS_QUERY_KEYS.local,
+export const useLocalPlugins = () => {
+ const { backend, orgId } = useActiveBackend();
+
+ return useQuery<LocalPlugin[]>({
+ queryKey: [...PLUGINS_QUERY_KEYS.local, backend.id, orgId],
queryFn: () => PluginsService.getLocalPlugins(),
staleTime: 1000 * 60 * 10, // 10 minutes
refetchOnWindowFocus: false,
});
+};
diff --git a/src/hooks/query/use-plugin-file-content.ts b/src/hooks/query/use-plugin-file-content.ts
index 58d4404ab1..2e97c700bc 100644
--- a/src/hooks/query/use-plugin-file-content.ts
+++ b/src/hooks/query/use-plugin-file-content.ts
@@ -1,4 +1,5 @@
import { useQuery } from "@tanstack/react-query";
+import { useActiveBackend } from "#/contexts/active-backend-context";
import PluginsService, { type PluginFileContent } from "#/api/plugins-service";
/**
@@ -9,9 +10,17 @@ import PluginsService, { type PluginFileContent } from "#/api/plugins-service";
export const usePluginFileContent = (
basePath: string | null,
relativePath: string | null,
-) =>
- useQuery<PluginFileContent>({
- queryKey: ["plugin-file-content", basePath, relativePath],
+) => {
+ const { backend, orgId } = useActiveBackend();
+
+ return useQuery<PluginFileContent>({
+ queryKey: [
+ "plugin-file-content",
+ basePath,
+ relativePath,
+ backend.id,
+ orgId,
+ ],
queryFn: () => {
if (!basePath || !relativePath) throw new Error("No file selected");
return PluginsService.getPluginFileContent(basePath, relativePath);
@@ -21,3 +30,4 @@ export const usePluginFileContent = (
staleTime: 1000 * 60 * 10, // 10 minutes
refetchOnWindowFocus: false,
});
+};
diff --git a/src/hooks/query/use-plugins-marketplace.ts b/src/hooks/query/use-plugins-marketplace.ts
index de67f8a2a6..1dcbbef2ee 100644
--- a/src/hooks/query/use-plugins-marketplace.ts
+++ b/src/hooks/query/use-plugins-marketplace.ts
@@ -1,15 +1,20 @@
import { useQuery } from "@tanstack/react-query";
+import { useActiveBackend } from "#/contexts/active-backend-context";
import PluginsService, { type MarketplacePlugin } from "#/api/plugins-service";
+import { PLUGINS_QUERY_KEYS } from "./query-keys";
/**
* Query hook for the dynamic plugins marketplace catalog. The catalog is global
* (not project-scoped), and currently local-backend only β€” a cloud backend
* yields an empty list. Mirrors `useSkills`.
*/
-export const usePluginsMarketplace = () =>
- useQuery<MarketplacePlugin[]>({
- queryKey: ["plugins-marketplace"],
+export const usePluginsMarketplace = () => {
+ const { backend, orgId } = useActiveBackend();
+
+ return useQuery<MarketplacePlugin[]>({
+ queryKey: [...PLUGINS_QUERY_KEYS.marketplace, backend.id, orgId],
queryFn: () => PluginsService.getPluginsMarketplace(),
staleTime: 1000 * 60 * 10, // 10 minutes – catalog rarely changes
refetchOnWindowFocus: false,
});
+};
diff --git a/src/hooks/query/use-plugins.test.tsx b/src/hooks/query/use-plugins.test.tsx
new file mode 100644
index 0000000000..8b879def2d
--- /dev/null
+++ b/src/hooks/query/use-plugins.test.tsx
@@ -0,0 +1,43 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { renderHook, waitFor } from "@testing-library/react";
+import type { ReactNode } from "react";
+import { describe, expect, it, vi } from "vitest";
+import PluginsManagementService from "#/api/plugins-management-service";
+import { ActiveBackendProvider } from "#/contexts/active-backend-context";
+import { usePlugins } from "./use-plugins";
+import { PLUGINS_QUERY_KEYS } from "./query-keys";
+
+function renderUsePlugins() {
+ const queryClient = new QueryClient({
+ defaultOptions: { queries: { retry: false } },
+ });
+ const wrapper = ({ children }: { children: ReactNode }) => (
+ <QueryClientProvider client={queryClient}>
+ <ActiveBackendProvider>{children}</ActiveBackendProvider>
+ </QueryClientProvider>
+ );
+ return { queryClient, ...renderHook(() => usePlugins(), { wrapper }) };
+}
+
+describe("usePlugins", () => {
+ it("scopes its cache entry to the active backend", async () => {
+ vi.spyOn(
+ PluginsManagementService,
+ "listInstalledPlugins",
+ ).mockResolvedValue([]);
+
+ const { queryClient, result } = renderUsePlugins();
+ await waitFor(() => expect(result.current.isSuccess).toBe(true));
+
+ const [key] = queryClient
+ .getQueryCache()
+ .getAll()
+ .map((query) => query.queryKey);
+ // Unscoped, a second backend reads this same entry and shows the first
+ // backend's plugins.
+ expect(key.slice(0, PLUGINS_QUERY_KEYS.installed.length)).toEqual([
+ ...PLUGINS_QUERY_KEYS.installed,
+ ]);
+ expect(key.length).toBe(PLUGINS_QUERY_KEYS.installed.length + 2);
+ });
+});
diff --git a/src/hooks/query/use-plugins.ts b/src/hooks/query/use-plugins.ts
index ad1edb7388..b5fa33f091 100644
--- a/src/hooks/query/use-plugins.ts
+++ b/src/hooks/query/use-plugins.ts
@@ -1,4 +1,5 @@
import { useQuery } from "@tanstack/react-query";
+import { useActiveBackend } from "#/contexts/active-backend-context";
import PluginsManagementService, {
type InstalledPluginInfo,
} from "#/api/plugins-management-service";
@@ -8,10 +9,13 @@ import { PLUGINS_QUERY_KEYS } from "./query-keys";
* Query hook for the plugins installed on the local agent-server. Local-backend
* only β€” a cloud backend yields an empty list. Mirrors `useSkills`.
*/
-export const usePlugins = () =>
- useQuery<InstalledPluginInfo[]>({
- queryKey: PLUGINS_QUERY_KEYS.installed,
+export const usePlugins = () => {
+ const { backend, orgId } = useActiveBackend();
+
+ return useQuery<InstalledPluginInfo[]>({
+ queryKey: [...PLUGINS_QUERY_KEYS.installed, backend.id, orgId],
queryFn: () => PluginsManagementService.listInstalledPlugins(),
staleTime: 1000 * 60 * 10, // 10 minutes
refetchOnWindowFocus: false,
});
+};