fix circlular deps

Author: RhysSullivan

apps/cloud/package.json

@@ -11,6 +11,7 @@
     "@executor/plugin-google-discovery": "workspace:*",
     "@executor/plugin-graphql": "workspace:*",
     "@executor/plugin-mcp": "workspace:*",
+    "@executor/plugin-onepassword": "workspace:*",
     "@executor/plugin-openapi": "workspace:*",
     "@executor/react": "workspace:*",
     "@executor/sdk": "workspace:*",

apps/cloud/src/routes/index.tsx

@@ -1,6 +1,17 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { SourcesPage } from "@executor/react/pages/sources";
+import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
+import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
+import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
+import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
+
+const sourcePlugins = [
+  openApiSourcePlugin,
+  mcpSourcePlugin,
+  googleDiscoverySourcePlugin,
+  graphqlSourcePlugin,
+];
 
 export const Route = createFileRoute("/")({
-  component: SourcesPage,
+  component: () => <SourcesPage sourcePlugins={sourcePlugins} />,
 });

apps/cloud/src/routes/secrets.tsx

@@ -1,6 +1,9 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { SecretsPage } from "@executor/react/pages/secrets";
+import { onePasswordSecretProviderPlugin } from "@executor/plugin-onepassword/react";
+
+const secretProviderPlugins = [onePasswordSecretProviderPlugin];
 
 export const Route = createFileRoute("/secrets")({
-  component: SecretsPage,
+  component: () => <SecretsPage secretProviderPlugins={secretProviderPlugins} />,
 });

apps/cloud/src/routes/sources.add.$pluginKey.tsx

@@ -1,6 +1,17 @@
 import { Schema } from "effect";
 import { createFileRoute } from "@tanstack/react-router";
 import { SourcesAddPage } from "@executor/react/pages/sources-add";
+import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
+import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
+import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
+import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
+
+const sourcePlugins = [
+  openApiSourcePlugin,
+  mcpSourcePlugin,
+  googleDiscoverySourcePlugin,
+  graphqlSourcePlugin,
+];
 
 const SearchParams = Schema.standardSchemaV1(
   Schema.Struct({
@@ -14,6 +25,6 @@ export const Route = createFileRoute("/sources/add/$pluginKey")({
   component: () => {
     const { pluginKey } = Route.useParams();
     const { url, preset } = Route.useSearch();
-    return <SourcesAddPage pluginKey={pluginKey} url={url} preset={preset} />;
+    return <SourcesAddPage pluginKey={pluginKey} url={url} preset={preset} sourcePlugins={sourcePlugins} />;
   },
 });

apps/local/src/routes/index.tsx

@@ -1,6 +1,17 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { SourcesPage } from "@executor/react/pages/sources";
+import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
+import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
+import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
+import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
+
+const sourcePlugins = [
+  openApiSourcePlugin,
+  mcpSourcePlugin,
+  googleDiscoverySourcePlugin,
+  graphqlSourcePlugin,
+];
 
 export const Route = createFileRoute("/")({
-  component: SourcesPage,
+  component: () => <SourcesPage sourcePlugins={sourcePlugins} />,
 });

apps/local/src/routes/secrets.tsx

@@ -1,6 +1,9 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { SecretsPage } from "@executor/react/pages/secrets";
+import { onePasswordSecretProviderPlugin } from "@executor/plugin-onepassword/react";
+
+const secretProviderPlugins = [onePasswordSecretProviderPlugin];
 
 export const Route = createFileRoute("/secrets")({
-  component: SecretsPage,
+  component: () => <SecretsPage secretProviderPlugins={secretProviderPlugins} />,
 });

apps/local/src/routes/sources.add.$pluginKey.tsx

@@ -1,6 +1,17 @@
 import { Schema } from "effect";
 import { createFileRoute } from "@tanstack/react-router";
 import { SourcesAddPage } from "@executor/react/pages/sources-add";
+import { openApiSourcePlugin } from "@executor/plugin-openapi/react";
+import { mcpSourcePlugin } from "@executor/plugin-mcp/react";
+import { googleDiscoverySourcePlugin } from "@executor/plugin-google-discovery/react";
+import { graphqlSourcePlugin } from "@executor/plugin-graphql/react";
+
+const sourcePlugins = [
+  openApiSourcePlugin,
+  mcpSourcePlugin,
+  googleDiscoverySourcePlugin,
+  graphqlSourcePlugin,
+];
 
 const SearchParams = Schema.standardSchemaV1(
   Schema.Struct({
@@ -14,6 +25,6 @@ export const Route = createFileRoute("/sources/add/$pluginKey")({
   component: () => {
     const { pluginKey } = Route.useParams();
     const { url, preset } = Route.useSearch();
-    return <SourcesAddPage pluginKey={pluginKey} url={url} preset={preset} />;
+    return <SourcesAddPage pluginKey={pluginKey} url={url} preset={preset} sourcePlugins={sourcePlugins} />;
   },
 });

bun.lock

@@ -17,11 +17,6 @@
     "@effect/platform": "catalog:",
     "@effect-atom/atom-react": "^0.5.0",
     "@executor/api": "workspace:*",
-    "@executor/plugin-google-discovery": "workspace:*",
-    "@executor/plugin-graphql": "workspace:*",
-    "@executor/plugin-mcp": "workspace:*",
-    "@executor/plugin-onepassword": "workspace:*",
-    "@executor/plugin-openapi": "workspace:*",
     "@executor/sdk": "workspace:*",
     "@tanstack/react-router": "catalog:",
     "@shikijs/langs": "^4.0.2",

packages/react/package.json

@@ -4,7 +4,6 @@ import { secretsAtom, setSecret, removeSecret } from "../api/atoms";
 import type { SecretProviderPlugin } from "../plugins/secret-provider-plugin";
 import { SecretId } from "@executor/sdk";
 import { useScope } from "../hooks/use-scope";
-import { onePasswordSecretProviderPlugin } from "@executor/plugin-onepassword/react";
 import {
   Dialog,
   DialogContent,
@@ -256,19 +255,12 @@ function SecretRow(props: {
   );
 }
 
-// ---------------------------------------------------------------------------
-// Secret provider plugins
-// ---------------------------------------------------------------------------
-
-const secretProviderPlugins: SecretProviderPlugin[] = [
-  onePasswordSecretProviderPlugin,
-];
-
 // ---------------------------------------------------------------------------
 // Page
 // ---------------------------------------------------------------------------
 
-export function SecretsPage() {
+export function SecretsPage(props: { secretProviderPlugins: readonly SecretProviderPlugin[] }) {
+  const { secretProviderPlugins } = props;
   const [addOpen, setAddOpen] = useState(false);
   const scopeId = useScope();
   const secrets = useAtomValue(secretsAtom(scopeId));