From 11e78b29ad54ce414f3a498e56553ed099dff029 Mon Sep 17 00:00:00 2001
From: safwanuahmed <safahmed@gitlab.com>
Date: Fri, 13 Jun 2025 11:02:36 -0400
Subject: [PATCH] Fetch organization cluster agents in
 get_project_details_query

---
 .../javascripts/pages/projects/show/index.js  |   3 +-
 app/assets/javascripts/repository/index.js    |   2 +
 .../javascripts/repository/init_header_app.js |   2 +
 ...t_agents_with_mapping_status.query.graphql |   4 +-
 .../components/get_project_details_query.vue  |  66 +++++---
 ...es_namespace_cluster_agents.query.graphql} |   6 +-
 ..._organization_cluster_agents.query.graphql |  18 +++
 ee/app/helpers/ee/blob_helper.rb              |   9 +-
 ee/app/helpers/ee/tree_helper.rb              |   6 +-
 .../helpers/remote_development/blob_helper.rb |  18 +++
 .../remote_development/readme_helper.rb       |   3 +-
 .../helpers/remote_development/tree_helper.rb |  18 +++
 ee/app/views/projects/buttons/_code.html.haml |   6 +-
 .../workspaces/index.html.haml                |   1 +
 .../compact_code_dropdown_spec.js             |   2 +
 .../repository/components/header_area_spec.js |   1 +
 .../components/web_ide_link_spec.js           |   2 +
 .../components/agent_details_popover_spec.js  |   4 +-
 ...t_agents_with_mapping_status_query_spec.js |   4 +-
 .../get_project_details_query_spec.js         | 152 ++++++++++++------
 .../frontend/workspaces/mock_data/index.js    |  92 +++++++++--
 .../workspaces/user/pages/create_spec.js      |   3 +
 .../workspaces/user/router/index_spec.js      |   1 +
 ee/spec/helpers/ee/blob_helper_spec.rb        |  10 +-
 .../remote_development/blob_helper_spec.rb    |   7 +
 .../helper_shared_examples.rb                 |  26 +++
 .../remote_development/readme_helper_spec.rb  |  10 +-
 .../remote_development/tree_helper_spec.rb    |   8 +
 ee/spec/helpers/tree_helper_spec.rb           |  15 +-
 .../repository/components/header_area_spec.js |   2 +
 spec/helpers/blob_helper_spec.rb              |   4 +
 spec/helpers/readme_helper_spec.rb            |   3 +
 spec/helpers/tree_helper_spec.rb              |   4 +
 33 files changed, 398 insertions(+), 114 deletions(-)
 rename ee/app/assets/javascripts/workspaces/common/graphql/queries/{get_remote_development_cluster_agents.query.graphql => get_workspaces_namespace_cluster_agents.query.graphql} (53%)
 create mode 100644 ee/app/assets/javascripts/workspaces/common/graphql/queries/get_workspaces_organization_cluster_agents.query.graphql
 create mode 100644 ee/app/helpers/remote_development/blob_helper.rb
 create mode 100644 ee/app/helpers/remote_development/tree_helper.rb
 create mode 100644 ee/spec/helpers/remote_development/blob_helper_spec.rb
 create mode 100644 ee/spec/helpers/remote_development/helper_shared_examples.rb
 create mode 100644 ee/spec/helpers/remote_development/tree_helper_spec.rb

diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js
index 3d35ca1b4d90ae..35a1fa2b6ff5a3 100644
--- a/app/assets/javascripts/pages/projects/show/index.js
+++ b/app/assets/javascripts/pages/projects/show/index.js
@@ -82,6 +82,7 @@ const initCodeDropdown = () => {
     newWorkspacePath,
     projectId,
     projectPath,
+    organizationId,
   } = codeDropdownEl.dataset;
 
   const { gitpodEnabled, showWebIdeButton, showGitpodButton, webIdeUrl, gitpodUrl } =
@@ -93,7 +94,7 @@ const initCodeDropdown = () => {
 
   return new Vue({
     el: codeDropdownEl,
-    provide: { newWorkspacePath },
+    provide: { newWorkspacePath, organizationId },
     apolloProvider,
     render(createElement) {
       return createElement(CodeDropdownComponent, {
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index d74499c9dd2acf..f944dd226b2171 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -195,6 +195,7 @@ export default function setupVueRepositoryList() {
       directoryDownloadLinks,
       newWorkspacePath,
       projectId,
+      organizationId,
     } = codeDropdownEl.dataset;
 
     const CodeDropdownComponent = gon.features.directoryCodeDropdownUpdates
@@ -217,6 +218,7 @@ export default function setupVueRepositoryList() {
             projectId,
             projectPath,
             newWorkspacePath,
+            organizationId,
           },
         });
       },
diff --git a/app/assets/javascripts/repository/init_header_app.js b/app/assets/javascripts/repository/init_header_app.js
index ae24b60be654f1..65d68a62581426 100644
--- a/app/assets/javascripts/repository/init_header_app.js
+++ b/app/assets/javascripts/repository/init_header_app.js
@@ -64,6 +64,7 @@ export default function initHeaderApp({ router, isReadmeView = false, isBlobView
       projectShortPath,
       isBinary,
       newWorkspacePath,
+      organizationId,
       fullName,
     } = headerEl.dataset;
 
@@ -132,6 +133,7 @@ export default function initHeaderApp({ router, isReadmeView = false, isBlobView
         isBlobView,
         isBinary: parseBoolean(isBinary),
         rootRef,
+        organizationId,
       },
       apolloProvider,
       router: router || createRouter(projectPath, escapedRef, fullName),
diff --git a/ee/app/assets/javascripts/workspaces/agent_mapping/graphql/queries/get_agents_with_mapping_status.query.graphql b/ee/app/assets/javascripts/workspaces/agent_mapping/graphql/queries/get_agents_with_mapping_status.query.graphql
index df074421b2f812..1b6014d50f3f64 100644
--- a/ee/app/assets/javascripts/workspaces/agent_mapping/graphql/queries/get_agents_with_mapping_status.query.graphql
+++ b/ee/app/assets/javascripts/workspaces/agent_mapping/graphql/queries/get_agents_with_mapping_status.query.graphql
@@ -1,7 +1,7 @@
 query getAgentsWithMappingStatus($namespace: ID!) {
   namespace(fullPath: $namespace) {
     id
-    mappedAgents: remoteDevelopmentClusterAgents(filter: DIRECTLY_MAPPED) {
+    mappedAgents: workspacesClusterAgents(filter: DIRECTLY_MAPPED) {
       nodes {
         id
         name
@@ -16,7 +16,7 @@ query getAgentsWithMappingStatus($namespace: ID!) {
         }
       }
     }
-    unmappedAgents: remoteDevelopmentClusterAgents(filter: UNMAPPED) {
+    unmappedAgents: workspacesClusterAgents(filter: UNMAPPED) {
       nodes {
         id
         name
diff --git a/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue b/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
index e1131dc17ee396..14a7ea88b50b1c 100644
--- a/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
+++ b/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
@@ -1,9 +1,13 @@
 <script>
 import { logError } from '~/lib/logger';
+import { convertToGraphQLId } from '~/graphql_shared/utils';
+import { TYPE_ORGANIZATION } from '~/graphql_shared/constants';
 import getProjectDetailsQuery from '../graphql/queries/get_project_details.query.graphql';
-import getRemoteDevelopmentClusterAgents from '../graphql/queries/get_remote_development_cluster_agents.query.graphql';
+import getWorkspacesNamespaceClusterAgents from '../graphql/queries/get_workspaces_namespace_cluster_agents.query.graphql';
+import getWorkspacesOrganizationClusterAgents from '../graphql/queries/get_workspaces_organization_cluster_agents.query.graphql';
 
 export default {
+  inject: ['organizationId'],
   props: {
     projectFullPath: {
       type: String,
@@ -51,7 +55,8 @@ export default {
           return;
         }
 
-        const { clusterAgents, errors } = await this.fetchRemoteDevelopmentClusterAgents(
+        const { clusterAgents, errors } = await this.fetchClusterAgents(
+          this.organizationId,
           group.fullPath,
         );
 
@@ -72,33 +77,56 @@ export default {
     },
   },
   methods: {
-    async fetchRemoteDevelopmentClusterAgents(namespace) {
+    async fetchClusterAgents(organizationId, namespace) {
       try {
-        // noinspection JSCheckFunctionSignatures - TODO: Address in https://gitlab.com/gitlab-org/gitlab/-/issues/437600
-        const { data, error } = await this.$apollo.query({
-          query: getRemoteDevelopmentClusterAgents,
-          variables: { namespace },
-        });
+        // Execute both queries in parallel
+        const [namespaceResult, organizationResult] = await Promise.all([
+          this.$apollo.query({
+            query: getWorkspacesNamespaceClusterAgents,
+            variables: {
+              namespace,
+            },
+          }),
+
+          this.$apollo.query({
+            query: getWorkspacesOrganizationClusterAgents,
+            variables: {
+              organizationID: convertToGraphQLId(TYPE_ORGANIZATION, organizationId),
+            },
+          }),
+        ]);
 
-        if (error) {
-          // NOTE: It seems to be impossible to have test coverage for this line
-          //       with the current version of mock-apollo-client. Any type of
-          //       mock error is always thrown and caught below instead of
-          //       being returned.
-          return { errors: [error] };
+        // Check for errors in either result
+        if (namespaceResult.error || organizationResult.error) {
+          return {
+            errors: [namespaceResult.error, organizationResult.error].filter(Boolean),
+          };
         }
 
+        const organizationAgents = this.mapAgents(organizationResult.data.organizationAgents);
+        const namespaceAgents = this.mapAgents(namespaceResult.data.namespaceAgents);
+
+        // Some agents mapped at the org level might also be mapped on the namespace level
+        // we should remove duplicates
+        const seenIds = new Set();
+        const allClusterAgents = [...organizationAgents, ...namespaceAgents].filter(
+          (agent) => !seenIds.has(agent.value) && seenIds.add(agent.value),
+        );
+
         return {
-          clusterAgents:
-            data.namespace?.remoteDevelopmentClusterAgents?.nodes.map(({ id, name, project }) => ({
-              value: id,
-              text: `${project.nameWithNamespace} / ${name}`,
-            })) || [],
+          clusterAgents: allClusterAgents,
         };
       } catch (error) {
         return { errors: [error] };
       }
     },
+    mapAgents(agents) {
+      const nodes = agents?.workspacesClusterAgents?.nodes || [];
+      return nodes.map(({ id, name, project }) => ({
+        value: id,
+        text: `${project.nameWithNamespace} / ${name}`,
+      }));
+    },
   },
   render() {
     return this.$scopedSlots.default?.();
diff --git a/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql b/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_workspaces_namespace_cluster_agents.query.graphql
similarity index 53%
rename from ee/app/assets/javascripts/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql
rename to ee/app/assets/javascripts/workspaces/common/graphql/queries/get_workspaces_namespace_cluster_agents.query.graphql
index 745f85745fe4f0..d25f8b54fad065 100644
--- a/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql
+++ b/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_workspaces_namespace_cluster_agents.query.graphql
@@ -1,7 +1,7 @@
-query getRemoteDevelopmentClusterAgents($namespace: ID!) {
-  namespace(fullPath: $namespace) {
+query getWorkspacesNamespaceClusterAgents($namespace: ID!) {
+  namespaceAgents: namespace(fullPath: $namespace) {
     id
-    remoteDevelopmentClusterAgents(filter: AVAILABLE) {
+    workspacesClusterAgents(filter: AVAILABLE) {
       nodes {
         id
         name
diff --git a/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_workspaces_organization_cluster_agents.query.graphql b/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_workspaces_organization_cluster_agents.query.graphql
new file mode 100644
index 00000000000000..2d24db18b19430
--- /dev/null
+++ b/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_workspaces_organization_cluster_agents.query.graphql
@@ -0,0 +1,18 @@
+query getWorkspacesOrganizationClusterAgents($organizationID: OrganizationsOrganizationID!) {
+  organizationAgents: organization(id: $organizationID) {
+    id
+    workspacesClusterAgents(filter: DIRECTLY_MAPPED) {
+      nodes {
+        id
+        name
+        project {
+          id
+          nameWithNamespace
+        }
+        workspacesAgentConfig {
+          id
+        }
+      }
+    }
+  }
+}
diff --git a/ee/app/helpers/ee/blob_helper.rb b/ee/app/helpers/ee/blob_helper.rb
index 267f3a354af5e7..c6b3e4d333eb1f 100644
--- a/ee/app/helpers/ee/blob_helper.rb
+++ b/ee/app/helpers/ee/blob_helper.rb
@@ -6,9 +6,7 @@ module BlobHelper
 
     override :vue_blob_header_app_data
     def vue_blob_header_app_data(project, blob, ref)
-      super.merge({
-        new_workspace_path: new_remote_development_workspace_path
-      })
+      super.merge(vue_blob_workspace_data)
     end
 
     override :vue_blob_app_data
@@ -21,9 +19,8 @@ def show_duo_workflow_action?(blob)
 
     def vue_blob_app_data(project, blob, ref)
       super.merge({
-        explain_code_available: ::Gitlab::Llm::TanukiBot.enabled_for?(user: current_user, container: project).to_s,
-        new_workspace_path: new_remote_development_workspace_path
-      })
+        explain_code_available: ::Gitlab::Llm::TanukiBot.enabled_for?(user: current_user, container: project).to_s
+      }.merge(vue_blob_workspace_data))
     end
   end
 end
diff --git a/ee/app/helpers/ee/tree_helper.rb b/ee/app/helpers/ee/tree_helper.rb
index 9c17580b885fc7..de65730c549fa3 100644
--- a/ee/app/helpers/ee/tree_helper.rb
+++ b/ee/app/helpers/ee/tree_helper.rb
@@ -7,9 +7,8 @@ module TreeHelper
     override :vue_tree_header_app_data
     def vue_tree_header_app_data(project, repository, ref, pipeline)
       super.merge({
-        new_workspace_path: new_remote_development_workspace_path,
         kerberos_url: alternative_kerberos_url? ? project.kerberos_url_to_repo : ''
-      })
+      }.merge(vue_tree_workspace_data))
     end
 
     override :vue_file_list_data
@@ -26,9 +25,8 @@ def vue_file_list_data(project, ref)
     override :web_ide_button_data
     def web_ide_button_data(options = {})
       super.merge({
-        new_workspace_path: new_remote_development_workspace_path,
         project_id: project_to_use.id
-      })
+      }.merge(vue_tree_workspace_data))
     end
   end
 end
diff --git a/ee/app/helpers/remote_development/blob_helper.rb b/ee/app/helpers/remote_development/blob_helper.rb
new file mode 100644
index 00000000000000..b67ae394ac024a
--- /dev/null
+++ b/ee/app/helpers/remote_development/blob_helper.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RemoteDevelopment
+  module BlobHelper
+    extend ActiveSupport::Concern
+
+    included do
+      # noinspection RubyResolve -- Rubymine not finding path helper
+      # @return [Hash]
+      def vue_blob_workspace_data
+        {
+          new_workspace_path: new_remote_development_workspace_path,
+          organization_id: Current.organization.id
+        }
+      end
+    end
+  end
+end
diff --git a/ee/app/helpers/remote_development/readme_helper.rb b/ee/app/helpers/remote_development/readme_helper.rb
index 36332e4d3d9a47..cd11296753d5cf 100644
--- a/ee/app/helpers/remote_development/readme_helper.rb
+++ b/ee/app/helpers/remote_development/readme_helper.rb
@@ -9,7 +9,8 @@ module ReadmeHelper
       # @return [Hash]
       def vue_readme_header_additional_data
         {
-          new_workspace_path: new_remote_development_workspace_path
+          new_workspace_path: new_remote_development_workspace_path,
+          organization_id: Current.organization.id
         }
       end
     end
diff --git a/ee/app/helpers/remote_development/tree_helper.rb b/ee/app/helpers/remote_development/tree_helper.rb
new file mode 100644
index 00000000000000..b902766faa2579
--- /dev/null
+++ b/ee/app/helpers/remote_development/tree_helper.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RemoteDevelopment
+  module TreeHelper
+    extend ActiveSupport::Concern
+
+    included do
+      # noinspection RubyResolve -- Rubymine not finding path helper
+      # @return [Hash]
+      def vue_tree_workspace_data
+        {
+          new_workspace_path: new_remote_development_workspace_path,
+          organization_id: Current.organization.id
+        }
+      end
+    end
+  end
+end
diff --git a/ee/app/views/projects/buttons/_code.html.haml b/ee/app/views/projects/buttons/_code.html.haml
index 3581ac76eafb65..d196e854b3bccf 100644
--- a/ee/app/views/projects/buttons/_code.html.haml
+++ b/ee/app/views/projects/buttons/_code.html.haml
@@ -6,6 +6,6 @@
     #js-code-dropdown{ data: compact_code_dropdown_data(project, ref).merge(
       kerberos_url: alternative_kerberos_url? ? project.kerberos_url_to_repo : '',
       project_id: @project.id,
-      project_path: @project.full_path,
-      new_workspace_path: new_remote_development_workspace_path
-    ) }
+      project_path: @project.full_path
+    ).merge(vue_tree_workspace_data)
+    }
diff --git a/ee/app/views/remote_development/workspaces/index.html.haml b/ee/app/views/remote_development/workspaces/index.html.haml
index 43603bd59ad75c..3f00d42b20f71a 100644
--- a/ee/app/views/remote_development/workspaces/index.html.haml
+++ b/ee/app/views/remote_development/workspaces/index.html.haml
@@ -8,6 +8,7 @@
       workspaces_list_path: remote_development_workspaces_path,
       empty_state_svg_path: image_path('illustrations/empty-state/empty-workspaces-md.svg'),
       default_devfile: ::RemoteDevelopment::Settings::DefaultSettings.default_settings[:default_devfile_yaml][0],
+      organization_id: Current.organization.id.to_s,
     }.to_json
   }
 }
diff --git a/ee/spec/frontend/repository/components/code_dropdown/compact_code_dropdown_spec.js b/ee/spec/frontend/repository/components/code_dropdown/compact_code_dropdown_spec.js
index 6b1d90cf15158a..0d5128285d3758 100644
--- a/ee/spec/frontend/repository/components/code_dropdown/compact_code_dropdown_spec.js
+++ b/ee/spec/frontend/repository/components/code_dropdown/compact_code_dropdown_spec.js
@@ -14,6 +14,7 @@ describe('EE Compact Code Dropdown component', () => {
   const projectPath = 'group/project';
   const projectId = '123';
   const newWorkspacePath = '/workspaces/new';
+  const organizationId = '1';
   const directoryDownloadLinks = [
     { text: 'zip', path: `${httpUrl}/archive.zip` },
     { text: 'tar.gz', path: `${httpUrl}/archive.tar.gz` },
@@ -47,6 +48,7 @@ describe('EE Compact Code Dropdown component', () => {
       provide: {
         glFeatures: { remoteDevelopment: remoteDevelopmentFlag },
         newWorkspacePath,
+        organizationId,
       },
     });
   };
diff --git a/ee/spec/frontend/repository/components/header_area_spec.js b/ee/spec/frontend/repository/components/header_area_spec.js
index 0809847bb84d5b..b6e3efe10675bc 100644
--- a/ee/spec/frontend/repository/components/header_area_spec.js
+++ b/ee/spec/frontend/repository/components/header_area_spec.js
@@ -123,6 +123,7 @@ describe('HeaderArea', () => {
                 directoryCodeDropdownUpdates: true,
               },
               newWorkspacePath: '/workspaces/new',
+              organizationId: '1',
             },
             stubs: {
               CompactCodeDropdown,
diff --git a/ee/spec/frontend/vue_shared/components/web_ide_link_spec.js b/ee/spec/frontend/vue_shared/components/web_ide_link_spec.js
index c00bf82fbe163f..206cbdd4b4a69c 100644
--- a/ee/spec/frontend/vue_shared/components/web_ide_link_spec.js
+++ b/ee/spec/frontend/vue_shared/components/web_ide_link_spec.js
@@ -12,6 +12,7 @@ jest.mock('~/lib/utils/url_utility');
 describe('ee_component/vue_shared/components/web_ide_link', () => {
   const projectId = 1;
   const newWorkspacePath = 'workspaces/new';
+  const organizationId = '1';
   const projectPath = 'bar/foo';
   let wrapper;
 
@@ -88,6 +89,7 @@ describe('ee_component/vue_shared/components/web_ide_link', () => {
           props: { projectId, projectPath, gitRef: 'v1.0.0' },
           provide: {
             newWorkspacePath,
+            organizationId,
             glFeatures: {
               remoteDevelopment: true,
             },
diff --git a/ee/spec/frontend/workspaces/agent_mapping/components/agent_details_popover_spec.js b/ee/spec/frontend/workspaces/agent_mapping/components/agent_details_popover_spec.js
index 484897a6e9ba67..a705929f991613 100644
--- a/ee/spec/frontend/workspaces/agent_mapping/components/agent_details_popover_spec.js
+++ b/ee/spec/frontend/workspaces/agent_mapping/components/agent_details_popover_spec.js
@@ -54,7 +54,7 @@ describe('ee/workspaces/agent_mapping/components/agent_details_popover.vue', ()
 
       expect(popover.attributes()).toMatchObject({
         target: EXPECTED_BUTTON_ID,
-        title: 'rootgroup-agent',
+        title: 'root-group-agent',
       });
     });
 
@@ -83,7 +83,7 @@ describe('ee/workspaces/agent_mapping/components/agent_details_popover.vue', ()
 
       expect(popover.attributes()).toMatchObject({
         target: EXPECTED_BUTTON_ID,
-        title: 'rootgroup-agent',
+        title: 'root-group-agent',
       });
     });
 
diff --git a/ee/spec/frontend/workspaces/agent_mapping/components/get_agents_with_mapping_status_query_spec.js b/ee/spec/frontend/workspaces/agent_mapping/components/get_agents_with_mapping_status_query_spec.js
index 4711b1f7c22680..523f448eda02f3 100644
--- a/ee/spec/frontend/workspaces/agent_mapping/components/get_agents_with_mapping_status_query_spec.js
+++ b/ee/spec/frontend/workspaces/agent_mapping/components/get_agents_with_mapping_status_query_spec.js
@@ -89,7 +89,7 @@ describe('workspaces/agent_mapping/components/get_agents_with_mapping_status_que
               agents: [
                 {
                   id: 'gid://gitlab/Clusters::Agent/1',
-                  name: 'rootgroup-agent',
+                  name: 'root-group-agent',
                   project: {
                     id: 'gid://gitlab/Project/101',
                     name: 'GitLab Agent One',
@@ -105,7 +105,7 @@ describe('workspaces/agent_mapping/components/get_agents_with_mapping_status_que
                 },
                 {
                   id: 'gid://gitlab/Clusters::Agent/2',
-                  name: 'rootgroup-agent-2',
+                  name: 'root-group-agent-2',
                   project: {
                     name: 'GitLab Agent Two',
                     id: 'gid://gitlab/Project/102',
diff --git a/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js b/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
index 5043ff483ff393..c5998680a97157 100644
--- a/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
+++ b/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
@@ -5,7 +5,8 @@ import { cloneDeep } from 'lodash';
 import { logError } from '~/lib/logger';
 import axios from '~/lib/utils/axios_utils';
 import getProjectDetailsQuery from 'ee/workspaces/common/graphql/queries/get_project_details.query.graphql';
-import getRemoteDevelopmentClusterAgentsQuery from 'ee/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql';
+import getWorkspacesNamespaceClusterAgents from 'ee/workspaces/common/graphql/queries/get_workspaces_namespace_cluster_agents.query.graphql';
+import getWorkspacesOrganizationClusterAgents from 'ee/workspaces/common/graphql/queries/get_workspaces_organization_cluster_agents.query.graphql';
 import GetProjectDetailsQuery from 'ee/workspaces/common/components/get_project_details_query.vue';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import createMockApollo from 'helpers/mock_apollo_helper';
@@ -13,8 +14,12 @@ import waitForPromises from 'helpers/wait_for_promises';
 
 import {
   GET_PROJECT_DETAILS_QUERY_RESULT,
-  GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
-  GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+  TRANSFORMED_GET_WORKSPACES_CLUSTER_AGENTS_QUERY_RESULT_ORG_AND_NAMESPACE_AGENTS,
+  TRANSFORMED_GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+  GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+  GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+  GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+  GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
 } from '../../mock_data';
 
 Vue.use(VueApollo);
@@ -23,20 +28,30 @@ jest.mock('~/lib/logger');
 
 describe('workspaces/common/components/get_project_details_query', () => {
   let getProjectDetailsQueryHandler;
-  let getRemoteDevelopmentClusterAgentsQueryHandler;
+  let getWorkspacesOrganizationClusterAgentsQueryHandler;
+  let getWorkspacesNamespaceClusterAgentsQueryHandler;
   let wrapper;
   let mockAxios;
 
   const projectFullPathFixture = 'gitlab-org/gitlab';
+  const organizationIdFixture = '1';
 
-  const setupRemoteDevelopmentClusterAgentsQueryHandler = (responses) => {
-    getRemoteDevelopmentClusterAgentsQueryHandler.mockResolvedValueOnce(responses);
+  const setupWorkspacesNamespaceClusterAgentsQueryHandler = (responses) => {
+    getWorkspacesNamespaceClusterAgentsQueryHandler.mockResolvedValueOnce(responses);
   };
 
-  const buildWrapper = async ({ projectFullPath = projectFullPathFixture } = {}) => {
+  const setupWorkspacesOrganizationClusterAgentsQueryHandler = (responses) => {
+    getWorkspacesOrganizationClusterAgentsQueryHandler.mockResolvedValueOnce(responses);
+  };
+
+  const buildWrapper = async ({
+    projectFullPath = projectFullPathFixture,
+    organizationId = organizationIdFixture,
+  } = {}) => {
     const apolloProvider = createMockApollo([
       [getProjectDetailsQuery, getProjectDetailsQueryHandler],
-      [getRemoteDevelopmentClusterAgentsQuery, getRemoteDevelopmentClusterAgentsQueryHandler],
+      [getWorkspacesOrganizationClusterAgents, getWorkspacesOrganizationClusterAgentsQueryHandler],
+      [getWorkspacesNamespaceClusterAgents, getWorkspacesNamespaceClusterAgentsQueryHandler],
     ]);
 
     // noinspection JSCheckFunctionSignatures - TODO: Address in https://gitlab.com/gitlab-org/gitlab/-/issues/437600
@@ -45,24 +60,18 @@ describe('workspaces/common/components/get_project_details_query', () => {
       propsData: {
         projectFullPath,
       },
+      provide: {
+        organizationId,
+      },
     });
 
     await waitForPromises();
   };
 
-  const transformRemoveDevelopmentClusterAgentGraphQLResultToClusterAgents = (
-    clusterAgentsGraphQLResult,
-  ) =>
-    clusterAgentsGraphQLResult.data.namespace.remoteDevelopmentClusterAgents.nodes.map(
-      ({ id, name, project }) => ({
-        text: `${project.nameWithNamespace} / ${name}`,
-        value: id,
-      }),
-    );
-
   beforeEach(() => {
     getProjectDetailsQueryHandler = jest.fn();
-    getRemoteDevelopmentClusterAgentsQueryHandler = jest.fn();
+    getWorkspacesOrganizationClusterAgentsQueryHandler = jest.fn();
+    getWorkspacesNamespaceClusterAgentsQueryHandler = jest.fn();
 
     logError.mockReset();
 
@@ -118,18 +127,26 @@ describe('workspaces/common/components/get_project_details_query', () => {
       await buildWrapper();
     });
 
-    it('executes getRemoteDevelopmentClusterAgents query', () => {
-      expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
-      expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledWith({
+    it('executes getWorkspacesClusterAgents query', () => {
+      expect(getWorkspacesNamespaceClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
+      expect(getWorkspacesOrganizationClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
+      expect(getWorkspacesNamespaceClusterAgentsQueryHandler).toHaveBeenCalledWith({
         namespace: 'gitlab-org/subgroup',
       });
+      expect(getWorkspacesOrganizationClusterAgentsQueryHandler).toHaveBeenCalledWith({
+        organizationID: 'gid://gitlab/Organizations::Organization/1',
+      });
     });
   });
 
   describe('when the project does not have a repository', () => {
     beforeEach(async () => {
-      setupRemoteDevelopmentClusterAgentsQueryHandler(
-        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      setupWorkspacesNamespaceClusterAgentsQueryHandler(
+        GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
+
+      setupWorkspacesOrganizationClusterAgentsQueryHandler(
+        GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
       );
       const customMockData = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
       customMockData.data.project.repository = null;
@@ -142,9 +159,7 @@ describe('workspaces/common/components/get_project_details_query', () => {
 
     it('emits result event with rootRef null', () => {
       expect(wrapper.emitted('result')[0][0]).toEqual({
-        clusterAgents: transformRemoveDevelopmentClusterAgentGraphQLResultToClusterAgents(
-          GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
-        ),
+        clusterAgents: TRANSFORMED_GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
         id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
         rootRef: null,
         nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
@@ -153,10 +168,14 @@ describe('workspaces/common/components/get_project_details_query', () => {
     });
   });
 
-  describe('when getRemoteDevelopmentClusterAgents query contains one or more cluster agents', () => {
+  describe('when a WorkspacesClusterAgents query contains one or more cluster agents', () => {
     beforeEach(async () => {
-      setupRemoteDevelopmentClusterAgentsQueryHandler(
-        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      setupWorkspacesNamespaceClusterAgentsQueryHandler(
+        GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
+
+      setupWorkspacesOrganizationClusterAgentsQueryHandler(
+        GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
       );
       await buildWrapper();
     });
@@ -165,9 +184,7 @@ describe('workspaces/common/components/get_project_details_query', () => {
       await waitForPromises();
 
       expect(wrapper.emitted('result')[0][0]).toEqual({
-        clusterAgents: transformRemoveDevelopmentClusterAgentGraphQLResultToClusterAgents(
-          GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
-        ),
+        clusterAgents: TRANSFORMED_GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
         id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
         rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
         fullPath: projectFullPathFixture,
@@ -176,10 +193,40 @@ describe('workspaces/common/components/get_project_details_query', () => {
     });
   });
 
-  describe('when getRemoteDevelopmentClusterAgents query does not contain cluster agents', () => {
+  describe('when getWorkspacesClusterAgents query response contains intersecting organization and namespace agents', () => {
     beforeEach(async () => {
-      setupRemoteDevelopmentClusterAgentsQueryHandler(
-        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+      setupWorkspacesNamespaceClusterAgentsQueryHandler(
+        GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
+
+      setupWorkspacesOrganizationClusterAgentsQueryHandler(
+        GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
+      await buildWrapper();
+    });
+
+    it('emits result event with unique cluster agents from organization and namespace', async () => {
+      await waitForPromises();
+
+      expect(wrapper.emitted('result')[0][0]).toEqual({
+        clusterAgents:
+          TRANSFORMED_GET_WORKSPACES_CLUSTER_AGENTS_QUERY_RESULT_ORG_AND_NAMESPACE_AGENTS,
+        id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
+        rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
+        fullPath: projectFullPathFixture,
+        nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
+      });
+    });
+  });
+
+  describe('when getWorkspacesClusterAgents query does not contain cluster agents', () => {
+    beforeEach(async () => {
+      setupWorkspacesNamespaceClusterAgentsQueryHandler(
+        GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+      );
+
+      setupWorkspacesOrganizationClusterAgentsQueryHandler(
+        GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
       );
       await buildWrapper();
     });
@@ -209,9 +256,10 @@ describe('workspaces/common/components/get_project_details_query', () => {
       await buildWrapper();
     });
 
-    it('does not execute the getRemoteDevelopmentClusterAgents query', () => {
+    it('does not execute any workspaceClusterAgents query', () => {
       expect(getProjectDetailsQueryHandler).toHaveBeenCalled();
-      expect(getRemoteDevelopmentClusterAgentsQueryHandler).not.toHaveBeenCalled();
+      expect(getWorkspacesNamespaceClusterAgentsQueryHandler).not.toHaveBeenCalled();
+      expect(getWorkspacesOrganizationClusterAgentsQueryHandler).not.toHaveBeenCalled();
     });
 
     it('emits result event with the project data', () => {
@@ -227,8 +275,12 @@ describe('workspaces/common/components/get_project_details_query', () => {
 
   describe('when the project full path changes from group to not group', () => {
     beforeEach(async () => {
-      setupRemoteDevelopmentClusterAgentsQueryHandler(
-        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      setupWorkspacesNamespaceClusterAgentsQueryHandler(
+        GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
+
+      setupWorkspacesOrganizationClusterAgentsQueryHandler(
+        GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
       );
       await waitForPromises();
     });
@@ -238,7 +290,8 @@ describe('workspaces/common/components/get_project_details_query', () => {
 
       await buildWrapper();
 
-      expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
+      expect(getWorkspacesNamespaceClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
+      expect(getWorkspacesOrganizationClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
 
       const projectWithoutGroup = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
       projectWithoutGroup.data.project.group = null;
@@ -265,17 +318,20 @@ describe('workspaces/common/components/get_project_details_query', () => {
   });
 
   describe.each`
-    queryName                                          | queryHandlerFactory
-    ${'getProjectDetailsQuery'}                        | ${() => getProjectDetailsQueryHandler}
-    ${'getRemoteDevelopmentClusterAgentsQueryHandler'} | ${() => getRemoteDevelopmentClusterAgentsQueryHandler}
+    queryName                                               | queryHandlerFactory
+    ${'getProjectDetailsQuery'}                             | ${() => getProjectDetailsQueryHandler}
+    ${'getWorkspacesNamespaceClusterAgentsQueryHandler'}    | ${() => getWorkspacesNamespaceClusterAgentsQueryHandler}
+    ${'getWorkspacesOrganizationClusterAgentsQueryHandler'} | ${() => getWorkspacesOrganizationClusterAgentsQueryHandler}
   `('when the $queryName query fails', ({ queryHandlerFactory }) => {
     const error = new Error();
 
     beforeEach(() => {
-      const mockedClusterAgentResponses = [
-        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
-      ];
-      setupRemoteDevelopmentClusterAgentsQueryHandler(mockedClusterAgentResponses);
+      setupWorkspacesNamespaceClusterAgentsQueryHandler([
+        GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+      ]);
+      setupWorkspacesOrganizationClusterAgentsQueryHandler([
+        GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+      ]);
 
       const queryHandler = queryHandlerFactory();
 
diff --git a/ee/spec/frontend/workspaces/mock_data/index.js b/ee/spec/frontend/workspaces/mock_data/index.js
index 8857d14702f13f..9a858337fc80fe 100644
--- a/ee/spec/frontend/workspaces/mock_data/index.js
+++ b/ee/spec/frontend/workspaces/mock_data/index.js
@@ -478,28 +478,40 @@ export const GET_PROJECTS_DETAILS_QUERY_RESULT = {
   },
 };
 
-export const GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS = {
+export const GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS = {
   data: {
-    namespace: {
+    namespaceAgents: {
       id: 'gid://gitlab/Group/81',
       fullPath: 'gitlab-org/subgroup',
-      remoteDevelopmentClusterAgents: {
+      workspacesClusterAgents: {
         nodes: [],
       },
     },
   },
 };
 
-export const GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = {
+export const GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS = {
   data: {
-    namespace: {
+    organizationAgents: {
+      id: 'gid://gitlab/Group/81',
+      fullPath: 'gitlab-org/subgroup',
+      workspacesClusterAgents: {
+        nodes: [],
+      },
+    },
+  },
+};
+
+export const GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = {
+  data: {
+    namespaceAgents: {
       id: 'gid://gitlab/Group/81',
       fullPath: 'gitlab-org/subgroup',
-      remoteDevelopmentClusterAgents: {
+      workspacesClusterAgents: {
         nodes: [
           {
             id: 'gid://gitlab/Clusters::Agent/1',
-            name: 'rootgroup-agent',
+            name: 'root-group-agent',
             project: {
               id: 'gid://gitlab/Project/101',
               nameWithNamespace: 'GitLab Org / GitLab Agent One',
@@ -510,7 +522,41 @@ export const GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = {
           },
           {
             id: 'gid://gitlab/Clusters::Agent/2',
-            name: 'rootgroup-agent-2',
+            name: 'root-group-agent-2',
+            project: {
+              id: 'gid://gitlab/Project/102',
+              nameWithNamespace: 'GitLab Org / GitLab Agent Two',
+            },
+            workspacesAgentConfig: {
+              id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/998',
+            },
+          },
+        ],
+      },
+    },
+  },
+};
+
+export const TRANSFORMED_GET_WORKSPACES_NAMESPACE_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = [
+  {
+    text: 'GitLab Org / GitLab Agent One / root-group-agent',
+    value: 'gid://gitlab/Clusters::Agent/1',
+  },
+  {
+    text: 'GitLab Org / GitLab Agent Two / root-group-agent-2',
+    value: 'gid://gitlab/Clusters::Agent/2',
+  },
+];
+
+export const GET_WORKSPACES_ORGANIZATION_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = {
+  data: {
+    organizationAgents: {
+      id: 'gid://gitlab/Organizations::Organization/1',
+      workspacesClusterAgents: {
+        nodes: [
+          {
+            id: 'gid://gitlab/Clusters::Agent/2',
+            name: 'root-group-agent-2',
             project: {
               id: 'gid://gitlab/Project/102',
               nameWithNamespace: 'GitLab Org / GitLab Agent Two',
@@ -519,15 +565,41 @@ export const GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS = {
               id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/998',
             },
           },
+          {
+            id: 'gid://gitlab/Clusters::Agent/3',
+            name: 'org-agent-1',
+            project: {
+              id: 'gid://gitlab/Project/103',
+              nameWithNamespace: 'GitLab Org / GitLab Agent Three',
+            },
+            workspacesAgentConfig: {
+              id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/999',
+            },
+          },
         ],
       },
     },
   },
 };
 
+export const TRANSFORMED_GET_WORKSPACES_CLUSTER_AGENTS_QUERY_RESULT_ORG_AND_NAMESPACE_AGENTS = [
+  {
+    text: 'GitLab Org / GitLab Agent Two / root-group-agent-2',
+    value: 'gid://gitlab/Clusters::Agent/2',
+  },
+  {
+    text: 'GitLab Org / GitLab Agent Three / org-agent-1',
+    value: 'gid://gitlab/Clusters::Agent/3',
+  },
+  {
+    text: 'GitLab Org / GitLab Agent One / root-group-agent',
+    value: 'gid://gitlab/Clusters::Agent/1',
+  },
+];
+
 export const MAPPED_CLUSTER_AGENT = {
   id: 'gid://gitlab/Clusters::Agent/1',
-  name: 'rootgroup-agent',
+  name: 'root-group-agent',
   project: {
     id: 'gid://gitlab/Project/101',
     name: 'GitLab Agent One',
@@ -547,7 +619,7 @@ export const MAPPED_CLUSTER_AGENT = {
 
 export const UNMAPPED_CLUSTER_AGENT = {
   id: 'gid://gitlab/Clusters::Agent/2',
-  name: 'rootgroup-agent-2',
+  name: 'root-group-agent-2',
   project: {
     id: 'gid://gitlab/Project/102',
     name: 'GitLab Agent Two',
diff --git a/ee/spec/frontend/workspaces/user/pages/create_spec.js b/ee/spec/frontend/workspaces/user/pages/create_spec.js
index 3a1f3b04fef003..677b709e6ad82b 100644
--- a/ee/spec/frontend/workspaces/user/pages/create_spec.js
+++ b/ee/spec/frontend/workspaces/user/pages/create_spec.js
@@ -122,6 +122,9 @@ describe('workspaces/user/pages/create.vue', () => {
         GlSprintf,
         GlFormGroup,
       },
+      provide: {
+        organizationId: '1',
+      },
       mocks: {
         $router: mockRouter,
       },
diff --git a/ee/spec/frontend/workspaces/user/router/index_spec.js b/ee/spec/frontend/workspaces/user/router/index_spec.js
index 8d72d39980d720..e57eadaaefc8bb 100644
--- a/ee/spec/frontend/workspaces/user/router/index_spec.js
+++ b/ee/spec/frontend/workspaces/user/router/index_spec.js
@@ -58,6 +58,7 @@ describe('workspaces/user/router/index.js', () => {
       provide: {
         emptyStateSvgPath: SVG_PATH,
         defaultDevfile: 'mock-devfile-value',
+        organizationId: '1',
       },
       stubs: {
         SearchProjectsListbox: {
diff --git a/ee/spec/helpers/ee/blob_helper_spec.rb b/ee/spec/helpers/ee/blob_helper_spec.rb
index 2286edbf5fccec..2c83294e8b5c42 100644
--- a/ee/spec/helpers/ee/blob_helper_spec.rb
+++ b/ee/spec/helpers/ee/blob_helper_spec.rb
@@ -66,15 +66,18 @@
   describe '#vue_blob_header_app_data' do
     let(:blob) { fake_blob(path: 'file.md', size: 2.megabytes) }
     let(:project) { build_stubbed(:project) }
+    let(:organization) { build_stubbed(:organization) }
     let(:ref) { 'main' }
     let(:breadcrumb_data) { { title: 'README.md', 'is-last': true } }
 
     it 'returns data related to blob header app' do
+      Current.organization = organization
       allow(helper).to receive_messages(selected_branch: ref, current_user: nil,
         breadcrumb_data_attributes: breadcrumb_data)
 
       expect(helper.vue_blob_header_app_data(project, blob, ref)).to include({
-        new_workspace_path: new_remote_development_workspace_path
+        new_workspace_path: new_remote_development_workspace_path,
+        organization_id: organization.id
       })
     end
   end
@@ -82,15 +85,18 @@
   describe '#vue_blob_app_data' do
     let(:blob) { fake_blob(path: 'file.md', size: 2.megabytes) }
     let(:project) { build_stubbed(:project) }
+    let(:organization) { build_stubbed(:organization) }
     let(:ref) { 'main' }
 
     it 'returns data related to blob app' do
       allow(helper).to receive_messages(selected_branch: ref, current_user: nil)
+      Current.organization = organization
 
       expect(helper.vue_blob_app_data(project, blob, ref)).to include({
         user_id: '',
         explain_code_available: 'false',
-        new_workspace_path: new_remote_development_workspace_path
+        new_workspace_path: new_remote_development_workspace_path,
+        organization_id: organization.id
       })
     end
   end
diff --git a/ee/spec/helpers/remote_development/blob_helper_spec.rb b/ee/spec/helpers/remote_development/blob_helper_spec.rb
new file mode 100644
index 00000000000000..38272165fa4130
--- /dev/null
+++ b/ee/spec/helpers/remote_development/blob_helper_spec.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative 'helper_shared_examples'
+
+RSpec.describe RemoteDevelopment::BlobHelper, feature_category: :workspaces do
+  include_examples "workspace_helper_data", helper_method: :vue_blob_workspace_data
+end
diff --git a/ee/spec/helpers/remote_development/helper_shared_examples.rb b/ee/spec/helpers/remote_development/helper_shared_examples.rb
new file mode 100644
index 00000000000000..3cacfd2dd17d77
--- /dev/null
+++ b/ee/spec/helpers/remote_development/helper_shared_examples.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+
+RSpec.shared_examples "workspace_helper_data" do |helper_method:|
+  let(:organization) { instance_double("Organizations::Organization", id: 1) } # rubocop:disable RSpec/VerifiedDoubleReference -- We're using the quoted version so we can use fast_spec_helper
+  let(:mock_helper_class) do
+    helper_module = described_class
+    Class.new do
+      include helper_module
+      def new_remote_development_workspace_path
+        "/workspaces/new"
+      end
+    end
+  end
+
+  let(:helper) { mock_helper_class.new }
+
+  it 'returns new_workspace_path and organization_id' do
+    Current.organization = organization
+    expect(helper.public_send(helper_method)).to include(
+      new_workspace_path: "/workspaces/new",
+      organization_id: 1
+    )
+  end
+end
diff --git a/ee/spec/helpers/remote_development/readme_helper_spec.rb b/ee/spec/helpers/remote_development/readme_helper_spec.rb
index 615902de84d8e3..8f2d51ef21acaa 100644
--- a/ee/spec/helpers/remote_development/readme_helper_spec.rb
+++ b/ee/spec/helpers/remote_development/readme_helper_spec.rb
@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require_relative 'helper_shared_examples'
 
+# In another spec file that might test a different method with similar behavior
 RSpec.describe RemoteDevelopment::ReadmeHelper, feature_category: :workspaces do
-  it 'returns new_workspace_path' do
-    # noinspection RubyResolve
-    expect(helper.vue_readme_header_additional_data).to include(
-      new_workspace_path: new_remote_development_workspace_path
-    )
-  end
+  include_examples "workspace_helper_data", helper_method: :vue_readme_header_additional_data
 end
diff --git a/ee/spec/helpers/remote_development/tree_helper_spec.rb b/ee/spec/helpers/remote_development/tree_helper_spec.rb
new file mode 100644
index 00000000000000..fed8da0c095fba
--- /dev/null
+++ b/ee/spec/helpers/remote_development/tree_helper_spec.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require_relative 'helper_shared_examples'
+
+# In another spec file that might test a different method with similar behavior
+RSpec.describe RemoteDevelopment::TreeHelper, feature_category: :workspaces do
+  include_examples "workspace_helper_data", helper_method: :vue_tree_workspace_data
+end
diff --git a/ee/spec/helpers/tree_helper_spec.rb b/ee/spec/helpers/tree_helper_spec.rb
index 1d92496f5ce529..c4c77598d257b0 100644
--- a/ee/spec/helpers/tree_helper_spec.rb
+++ b/ee/spec/helpers/tree_helper_spec.rb
@@ -13,17 +13,20 @@
 
   describe '#vue_tree_header_app_data' do
     let(:pipeline) { build_stubbed(:ci_pipeline, project: project) }
+    let(:organization) { build_stubbed(:organization) }
 
     before do
+      Current.organization = organization
       helper.instance_variable_set(:@project, project)
       helper.instance_variable_set(:@ref, sha)
     end
 
     subject { helper.vue_tree_header_app_data(project, repository, sha, pipeline) }
 
-    it 'returns new_workspace_path' do
+    it 'contains workspace data' do
       expect(helper.vue_tree_header_app_data(project, repository, sha, pipeline)).to include(
-        new_workspace_path: new_remote_development_workspace_path
+        new_workspace_path: new_remote_development_workspace_path,
+        organization_id: organization.id
       )
     end
 
@@ -70,17 +73,21 @@
   end
 
   describe '#web_ide_button_data' do
+    let(:organization) { build_stubbed(:organization) }
+
     before do
+      Current.organization = organization
       allow(helper).to receive(:project_to_use).and_return(project)
       allow(helper).to receive(:project_ci_pipeline_editor_path).and_return('')
     end
 
-    it 'includes new_workspace_path  and project id properties' do
+    it 'includes workspace data and project id properties' do
       options = {}
 
       expect(helper.web_ide_button_data(options)).to include(
         new_workspace_path: new_remote_development_workspace_path,
-        project_id: project.id
+        project_id: project.id,
+        organization_id: organization.id
       )
     end
   end
diff --git a/spec/frontend/repository/components/header_area_spec.js b/spec/frontend/repository/components/header_area_spec.js
index 6f8c512a91e90b..8871a4437d2fad 100644
--- a/spec/frontend/repository/components/header_area_spec.js
+++ b/spec/frontend/repository/components/header_area_spec.js
@@ -205,6 +205,7 @@ describe('HeaderArea', () => {
             directoryCodeDropdownUpdates: true,
           },
           newWorkspacePath: '/workspaces/new',
+          organizationId: '1',
         },
       });
     });
@@ -339,6 +340,7 @@ describe('HeaderArea', () => {
               directoryCodeDropdownUpdates: true,
             },
             newWorkspacePath: '/workspaces/new',
+            organizationId: '1',
             isReadmeView: true,
           },
         });
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb
index 83b934fc747be8..8e9c13aa26a992 100644
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
@@ -398,8 +398,10 @@
     let(:project) { create(:project) }
     let(:user) { build_stubbed(:user) }
     let(:ref) { 'main' }
+    let(:organization) { build_stubbed(:organization) }
 
     before do
+      Current.organization = organization
       allow(helper).to receive_messages(selected_branch: ref, current_user: user)
     end
 
@@ -587,8 +589,10 @@
     let(:ref) { 'feature' }
     let(:ref_type) { :branch }
     let(:breadcrumb_data) { { title: 'README.md', 'is-last': true } }
+    let(:organization) { build_stubbed(:organization) }
 
     before do
+      Current.organization = organization
       assign(:project, project)
       assign(:ref, ref)
       assign(:ref_type, ref_type)
diff --git a/spec/helpers/readme_helper_spec.rb b/spec/helpers/readme_helper_spec.rb
index a119c19dd5aeff..dd5020d796f7b8 100644
--- a/spec/helpers/readme_helper_spec.rb
+++ b/spec/helpers/readme_helper_spec.rb
@@ -3,7 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe ReadmeHelper, feature_category: :source_code_management do
+  let(:organization) { build_stubbed(:organization) }
+
   it 'returns a hash' do
+    Current.organization = organization
     expect(helper.vue_readme_header_additional_data).to be_a(Hash)
   end
 end
diff --git a/spec/helpers/tree_helper_spec.rb b/spec/helpers/tree_helper_spec.rb
index 408df91a236a19..8fea42c5fb9915 100644
--- a/spec/helpers/tree_helper_spec.rb
+++ b/spec/helpers/tree_helper_spec.rb
@@ -96,9 +96,11 @@
   end
 
   describe '#vue_tree_header_app_data' do
+    let(:organization) { build_stubbed(:organization) }
     let(:pipeline) { build_stubbed(:ci_pipeline, project: project) }
 
     before do
+      Current.organization = organization
       helper.instance_variable_set(:@project, project)
       helper.instance_variable_set(:@ref, sha)
       allow(helper).to receive(:can?).and_return(false)
@@ -191,11 +193,13 @@
 
   describe '#web_ide_button_data' do
     let(:blob) { project.repository.blob_at('refs/heads/master', @path) }
+    let(:organization) { build_stubbed(:organization) }
 
     let_it_be(:user_preferences_gitpod_path) { '/-/profile/preferences#user_gitpod_enabled' }
     let_it_be(:user_profile_enable_gitpod_path) { '/-/user_settings/profile?user%5Bgitpod_enabled%5D=true' }
 
     before do
+      Current.organization = organization
       @path = ''
       @project = project
       @ref = sha
-- 
GitLab