fix

Author: icecrasher321

apps/sim/lib/workflows/subblocks/options.ts

@@ -1,10 +1,6 @@
-import { fetchPersonalEnvironment, fetchWorkspaceEnvironment } from '@/lib/environment/api'
+import { fetchWorkspaceEnvironment } from '@/lib/environment/api'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
-import {
-  environmentKeys,
-  PERSONAL_ENVIRONMENT_STALE_TIME,
-  WORKSPACE_ENVIRONMENT_STALE_TIME,
-} from '@/hooks/queries/environment'
+import { environmentKeys, WORKSPACE_ENVIRONMENT_STALE_TIME } from '@/hooks/queries/environment'
 import { getSandboxListQueryOptions, type SandboxListResponse } from '@/hooks/queries/sandboxes'
 import { getWorkflowListQueryOptions } from '@/hooks/queries/utils/workflow-list-query'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -43,33 +39,33 @@ export async function fetchWorkspaceWorkflowOptions(options?: {
  * Loads the active workspace's secret NAMES for the Function block's secret-scope
  * picker. Names only — values stay server-side and are injected at execution, the
  * same discipline the copilot's workspace context uses.
+ *
+ * Both halves come from the single workspace-environment response, which is the
+ * client-side mirror of `getEffectiveDecryptedEnv` — the resolver the executor
+ * injects from. Its `personal` slice is NOT the caller's raw personal variables:
+ * under credential filtering it also carries personal secrets other members have
+ * shared into the workspace, so reading `/api/environment` instead would hide
+ * names the code can genuinely resolve. This is the same pair the `{{VAR}}`
+ * autocomplete lists, so the picker and the editor never disagree.
+ *
+ * Values are masked to `''` for non-admin viewers; only the keys are used here.
  */
 export async function fetchWorkspaceSecretNameOptions(): Promise<SubBlockOption[]> {
   const workspaceId = useWorkflowRegistry.getState().hydration.workspaceId
   if (!workspaceId) return []
 
-  const [workspace, personal] = await Promise.all([
-    getQueryClient().fetchQuery({
-      queryKey: environmentKeys.workspace(workspaceId),
-      queryFn: ({ signal }: { signal?: AbortSignal }) =>
-        fetchWorkspaceEnvironment(workspaceId, signal),
-      staleTime: WORKSPACE_ENVIRONMENT_STALE_TIME,
-    }),
-    getQueryClient().fetchQuery({
-      queryKey: environmentKeys.personal(),
-      queryFn: ({ signal }: { signal?: AbortSignal }) => fetchPersonalEnvironment(signal),
-      staleTime: PERSONAL_ENVIRONMENT_STALE_TIME,
-    }),
-  ])
+  const environment = await getQueryClient().fetchQuery({
+    queryKey: environmentKeys.workspace(workspaceId),
+    queryFn: ({ signal }: { signal?: AbortSignal }) =>
+      fetchWorkspaceEnvironment(workspaceId, signal),
+    staleTime: WORKSPACE_ENVIRONMENT_STALE_TIME,
+  })
 
-  // Personal variables shadow workspace ones at execution, so both are offered
-  // under one de-duplicated list of names. `workspace.workspace` is already the
-  // flat name->value record (see `workspaceEnvironmentDataSchema`); reaching for
-  // a `.variables` sub-key under it yields undefined and silently drops every
-  // workspace secret from the picker.
+  // Workspace entries shadow personal ones at execution (`getEffectiveDecryptedEnv`
+  // spreads workspace last), but a name-only list just de-duplicates the union.
   const names = new Set<string>([
-    ...Object.keys(workspace?.workspace ?? {}),
-    ...Object.keys(personal ?? {}),
+    ...Object.keys(environment?.workspace ?? {}),
+    ...Object.keys(environment?.personal ?? {}),
   ])
   return [...names].sort().map((name) => ({ id: name, label: name }))
 }