From 466db5003a988c7d7045e02bea875711333a31ec Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Sat, 9 May 2026 17:52:19 -0500
Subject: [PATCH] filter deleted secrets in remote import query

---
 server/src/services/secrets.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/src/services/secrets.ts b/server/src/services/secrets.ts
index 335f998005a..17f13cef3d2 100644
--- a/server/src/services/secrets.ts
+++ b/server/src/services/secrets.ts
@@ -800,7 +800,7 @@ export function secretService(db: Db) {
   }
 
   async function buildRemoteImportConflictMaps(companyId: string, provider: SecretProvider) {
-    const existingSecrets = await db
+    const activeSecrets = await db
       .select({
         id: companySecrets.id,
         name: companySecrets.name,
@@ -811,8 +811,7 @@ export function secretService(db: Db) {
         status: companySecrets.status,
       })
       .from(companySecrets)
-      .where(eq(companySecrets.companyId, companyId));
-    const activeSecrets = existingSecrets.filter((secret) => secret.status !== "deleted");
+      .where(and(eq(companySecrets.companyId, companyId), ne(companySecrets.status, "deleted")));
     return {
       byProviderConfigExternalRef: new Map(
         activeSecrets