Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

Merge remote-tracking branch 'origin/main' into agent-vault-personal-values

Scott Wilsonfe065332e812
diff --cc backend/src/ee/services/agent-vault-proxy/agent-vault-proxy-service.ts
index c0dbce99dd,e2cbdbcc07..8767065d20
--- a/backend/src/ee/services/agent-vault-proxy/agent-vault-proxy-service.ts
+++ b/backend/src/ee/services/agent-vault-proxy/agent-vault-proxy-service.ts
@@@ -78,9 -71,8 +78,9 @@@ type TAgentVaultProxyServiceFactoryDep
agentVaultServiceCustomHeaderDAL: Pick<TAgentVaultServiceCustomHeaderDALFactory, "findByServiceIds">;
agentVaultServiceSubstitutionDAL: Pick<TAgentVaultServiceSubstitutionDALFactory, "findByServiceIds">;
agentVaultVariableDAL: Pick<TAgentVaultVariableDALFactory, "findValuesForResolve">;
+ agentVaultPersonalValueDAL: Pick<TAgentVaultPersonalValueDALFactory, "findForResolve">;
agentVaultSessionDAL: Pick<TAgentVaultSessionDALFactory, "findByTokenHash">;
- agentVaultSessionLogConfigDAL: Pick<TAgentVaultSessionLogConfigDALFactory, "findOne">;
+ agentVaultSessionLogConfigDAL: Pick<TAgentVaultSessionLogConfigDALFactory, "findOne" | "findByProjectIdFromPrimary">;
membershipDAL: Pick<TMembershipDALFactory, "findResourceMembershipsForActor">;
orgDAL: Pick<TOrgDALFactory, "findEffectiveOrgMembership">;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
diff --cc frontend/src/layouts/OrganizationLayout/components/OrgSidebar/AgentVaultNav.tsx
index a69233057f,17282d97a7..5a97c6a3e8
--- a/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/AgentVaultNav.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/OrgSidebar/AgentVaultNav.tsx
@@@ -8,14 -8,10 +8,11 @@@ import
SidebarMenuItem
} from "@app/components/v3";
import { useProjectPermission, useSubscription } from "@app/context";
- import {
- areAgentVaultSessionLogsOn,
- isAgentVaultSessionLogPlanLapsed
- } from "@app/helpers/agentVaultSessionLogs";
+ import { isAgentVaultSessionLogBlockedByPlan } from "@app/helpers/agentVaultSessionLogs";
import {
useGetAgentVaultSessionLogHealth,
- useGetAgentVaultSessionLogSettings
+ useGetAgentVaultSessionLogSettings,
+ useListGrantedAgentVaultAccessBundlesRequiringSetup
} from "@app/hooks/api/agentVault";
import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
@@@ -26,12 -22,10 +23,13 @@@ export const AgentVaultNav = ({ onSubme
const { hasProjectRole } = useProjectPermission();
const { setOpen: setIsIntroOpen } = useAgentVaultIntro();
const isAdmin = hasProjectRole(ProjectMembershipRole.Admin);
- const { data: sessionLogSettings } = useGetAgentVaultSessionLogSettings(isAdmin);
+ const { data: sessionLogState } = useGetAgentVaultSessionLogSettings(isAdmin);
+ const sessionLogSettings = sessionLogState?.settings ?? null;
const { data: sessionLogHealth } = useGetAgentVaultSessionLogHealth(isAdmin);
const { subscription } = useSubscription();
+ // An admin can use any bundle, but the nav only nags about the ones granted to them.
+ const { data: grantedRequiringSetup } = useListGrantedAgentVaultAccessBundlesRequiringSetup();
+ const needsSetup = Boolean(grantedRequiringSetup?.totalCount);
const accessItems: NavItem[] = [
{ label: "Sessions", icon: IdCard, pathSuffix: "sessions" },