From 508772cf58a4fd05e3720f60170ca636c3fee388 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Wed, 11 Feb 2026 20:06:27 -0800
Subject: [PATCH] make it autoselect personal secret when create secret is
 clicked

---
 .../sub-block/components/env-var-dropdown.tsx |  9 +++++++
 .../credentials/credentials-manager.tsx       | 26 ++++++++++++++-----
 apps/sim/hooks/queries/credentials.ts         |  2 ++
 apps/sim/lib/credentials/client-state.ts      | 13 +++++++++-
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
index 5df676c31..416e07950 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
@@ -9,6 +9,7 @@ import {
   PopoverSection,
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
+import { writePendingCredentialCreateRequest } from '@/lib/credentials/client-state'
 import {
   usePersonalEnvironment,
   useWorkspaceEnvironment,
@@ -168,6 +169,14 @@ export const EnvVarDropdown: React.FC<EnvVarDropdownProps> = ({
   }, [searchTerm])
 
   const openEnvironmentSettings = () => {
+    if (workspaceId) {
+      writePendingCredentialCreateRequest({
+        workspaceId,
+        type: 'env_personal',
+        envKey: searchTerm.trim(),
+        requestedAt: Date.now(),
+      })
+    }
     window.dispatchEvent(new CustomEvent('open-settings', { detail: { tab: 'credentials' } }))
     onClose?.()
   }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credentials/credentials-manager.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credentials/credentials-manager.tsx
index fcae0fdf0..4cf3dd16f 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credentials/credentials-manager.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credentials/credentials-manager.tsx
@@ -283,7 +283,7 @@ export function CredentialsManager() {
     const request = readPendingCredentialCreateRequest()
     if (!request) return
 
-    if (request.workspaceId !== workspaceId || request.type !== 'oauth') {
+    if (request.workspaceId !== workspaceId) {
       return
     }
 
@@ -293,10 +293,22 @@ export function CredentialsManager() {
     }
 
     setShowCreateModal(true)
-    setCreateType('oauth')
-    setCreateOAuthProviderId(request.providerId)
-    setCreateDisplayName(request.displayName)
+    setShowCreateOAuthRequiredModal(false)
     setCreateError(null)
+    setCreateEnvValue('')
+
+    if (request.type === 'oauth') {
+      setCreateType('oauth')
+      setCreateOAuthProviderId(request.providerId)
+      setCreateDisplayName(request.displayName)
+      setCreateEnvKey('')
+    } else {
+      setCreateType(request.type)
+      setCreateOAuthProviderId('')
+      setCreateDisplayName('')
+      setCreateEnvKey(request.envKey || '')
+    }
+
     clearPendingCredentialCreateRequest()
   }, [workspaceId])
 
@@ -635,7 +647,7 @@ export function CredentialsManager() {
           ) : sortedCredentials.length === 0 ? (
             <div className='rounded-[8px] border border-[var(--border-1)] px-[12px] py-[10px] text-[12px] text-[var(--text-tertiary)]'>
               {bootstrapCredentials.isPending
-                ? 'Syncing credentials from connected accounts and env vars...'
+                ? 'Syncing credentials from connected accounts and secrets...'
                 : 'No credentials available for this workspace.'}
             </div>
           ) : (
@@ -1031,14 +1043,14 @@ export function CredentialsManager() {
                   {selectedExistingEnvCredential && (
                     <div className='rounded-[8px] border border-[var(--brand-9)]/40 bg-[var(--surface-3)] px-[10px] py-[8px]'>
                       <p className='text-[12px] text-[var(--text-primary)]'>
-                        This env key already maps to credential{' '}
+                        This secret key already maps to credential{' '}
                         <span className='font-medium'>
                           {selectedExistingEnvCredential.displayName}
                         </span>
                         .
                       </p>
                       <p className='mt-[4px] text-[11px] text-[var(--text-tertiary)]'>
-                        Create will update the env value and reuse the existing credential.
+                        Create will update the secret value and reuse the existing credential.
                       </p>
                       <Button
                         variant='ghost'
diff --git a/apps/sim/hooks/queries/credentials.ts b/apps/sim/hooks/queries/credentials.ts
index 707c71c9a..db4443ba2 100644
--- a/apps/sim/hooks/queries/credentials.ts
+++ b/apps/sim/hooks/queries/credentials.ts
@@ -1,6 +1,7 @@
 'use client'
 
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { environmentKeys } from '@/hooks/queries/environment'
 import { fetchJson } from '@/hooks/selectors/helpers'
 
 export type WorkspaceCredentialType = 'oauth' | 'env_workspace' | 'env_personal'
@@ -186,6 +187,7 @@ export function useDeleteWorkspaceCredential() {
     onSuccess: (_data, credentialId) => {
       queryClient.invalidateQueries({ queryKey: workspaceCredentialKeys.detail(credentialId) })
       queryClient.invalidateQueries({ queryKey: workspaceCredentialKeys.all })
+      queryClient.invalidateQueries({ queryKey: environmentKeys.all })
     },
   })
 }
diff --git a/apps/sim/lib/credentials/client-state.ts b/apps/sim/lib/credentials/client-state.ts
index 4760f74fb..786f928e9 100644
--- a/apps/sim/lib/credentials/client-state.ts
+++ b/apps/sim/lib/credentials/client-state.ts
@@ -12,7 +12,7 @@ export interface PendingOAuthCredentialDraft {
   requestedAt: number
 }
 
-export interface PendingCredentialCreateRequest {
+interface PendingOAuthCredentialCreateRequest {
   workspaceId: string
   type: 'oauth'
   providerId: string
@@ -22,6 +22,17 @@ export interface PendingCredentialCreateRequest {
   requestedAt: number
 }
 
+interface PendingSecretCredentialCreateRequest {
+  workspaceId: string
+  type: 'env_personal' | 'env_workspace'
+  envKey?: string
+  requestedAt: number
+}
+
+export type PendingCredentialCreateRequest =
+  | PendingOAuthCredentialCreateRequest
+  | PendingSecretCredentialCreateRequest
+
 function parseJson<T>(raw: string | null): T | null {
   if (!raw) return null
   try {