Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/composables/auth/useCurrentUser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const useCurrentUser = () => {
const isLoggedIn = computed(
() => isApiKeyLogin.value || firebaseUser.value !== null
)
const isAuthInitialized = computed(() => authStore.isInitialized)

const resolvedUserInfo = computed<AuthUserInfo | null>(() => {
if (isApiKeyLogin.value && apiKeyStore.currentUser) {
Expand Down Expand Up @@ -118,6 +119,7 @@ export const useCurrentUser = () => {

return {
loading: authStore.loading,
isAuthInitialized,
isLoggedIn,
isApiKeyLogin,
isEmailProvider,
Expand Down
14 changes: 10 additions & 4 deletions src/composables/useFeatureFlags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import {
cachedV1PaymentRecovery,
isAuthenticatedConfigLoaded,
remoteConfig,
sessionAgentGrant
sessionAgentGrant,
sessionAgentGrantValidUntil
} from '@/platform/remoteConfig/remoteConfig'
import { useTelemetry } from '@/platform/telemetry'
import { api } from '@/scripts/api'
Expand Down Expand Up @@ -115,7 +116,8 @@ function resolveFailClosedBooleanFlag(flagKey: string): boolean {
function resolveWhitelistFlag(
flagKey: string,
remoteConfigValue: boolean | undefined,
grantedThisSession: Ref<boolean | undefined>
grantedThisSession: Ref<boolean | undefined>,
grantValidUntil: Ref<number | undefined>
): boolean {
const sessionOverride = getSessionOverride<boolean>(flagKey)
if (sessionOverride !== undefined) return sessionOverride
Expand All @@ -125,7 +127,10 @@ function resolveWhitelistFlag(

if (!isCloud) return false
if (!isAuthenticatedConfigLoaded.value)
return grantedThisSession.value === true
return (
grantedThisSession.value === true &&
(grantValidUntil.value ?? 0) > Date.now()
)

return remoteConfigValue === true
}
Expand Down Expand Up @@ -327,7 +332,8 @@ export function useFeatureFlags() {
return resolveWhitelistFlag(
ServerFeatureFlag.AGENT_IN_APP_EXPERIENCE,
remoteConfig.value['agent-in-app-experience'],
sessionAgentGrant
sessionAgentGrant,
sessionAgentGrantValidUntil
)
}
})
Expand Down
54 changes: 41 additions & 13 deletions src/extensions/core/agentPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { computed, ref, watch } from 'vue'
import { useCurrentUser } from '@/composables/auth/useCurrentUser'
import { useFeatureFlags } from '@/composables/useFeatureFlags'
import { useOnboardingTourStore } from '@/platform/onboarding/onboardingTourStore'
import { remoteConfigState } from '@/platform/remoteConfig/remoteConfig'
import {
authenticatedRemoteConfigState,
remoteConfigRevision
} from '@/platform/remoteConfig/remoteConfig'
import { useTelemetry } from '@/platform/telemetry'
import { reportError } from '@/platform/telemetry/reportError'
import type { AgentConsentNotOfferedReason } from '@/platform/telemetry/types'
Expand Down Expand Up @@ -173,7 +176,8 @@ export function registerAgentPanelExtension(): void {
const consentStore = useAgentConsentStore()
const { enabled } = storeToRefs(agentPanelStore)
const workspaceStore = useTeamWorkspaceStore()
const { resolvedUserInfo, isLoggedIn } = useCurrentUser()
const { resolvedUserInfo, isAuthInitialized, isLoggedIn } =
useCurrentUser()
const { withConsent } = useAgentConsent()
const { firstRunTookScreen, whenStartupDecided } = useFirstRunEntry()
const onboardingTourStore = useOnboardingTourStore()
Expand Down Expand Up @@ -330,20 +334,29 @@ export function registerAgentPanelExtension(): void {
loadConsentIfEligible()
}
)
setupFlagGate(loadConsentIfEligible)
setupFlagGate(
loadConsentIfEligible,
() => isAuthInitialized.value && resolvedUserInfo.value === null
)
}
})
}

function setupFlagGate(loadConsentIfEligible: () => void): void {
function setupFlagGate(
loadConsentIfEligible: () => void,
isSignedOut: () => boolean
): void {
const agentPanelStore = useAgentPanelStore()
const { flags } = useFeatureFlags()

watch(
() =>
import.meta.env.MODE === 'development' ||
flags.agentInAppExperienceEnabled,
(enabled) => {
[
import.meta.env.MODE === 'development' ||
flags.agentInAppExperienceEnabled,
remoteConfigRevision.value
] as const,
([enabled]) => {
agentPanelStore.enabled = enabled
loadConsentIfEligible()
if (!enabled) {
Expand All @@ -358,15 +371,30 @@ function setupFlagGate(loadConsentIfEligible: () => void): void {
const settle = (): void => {
agentPanelStore.gateSettled = true
}
let settleTimer: ReturnType<typeof setTimeout> | undefined
const clearSettleTimer = (): void => {
clearTimeout(settleTimer)
settleTimer = undefined
}
const scheduleSignedOutFallback = (): void => {
clearSettleTimer()
settleTimer = setTimeout(() => {
if (isSignedOut()) settle()
}, GATE_SETTLE_TIMEOUT_MS)
}
watch(
() =>
import.meta.env.MODE === 'development' ||
remoteConfigState.value === 'authenticated' ||
remoteConfigState.value === 'error',
(decided) => {
if (decided) settle()
[
import.meta.env.MODE === 'development' ||
authenticatedRemoteConfigState.value === 'authenticated' ||
authenticatedRemoteConfigState.value === 'error',
isSignedOut()
] as const,
([decided, signedOut]) => {
agentPanelStore.gateSettled = decided
clearSettleTimer()
if (!decided && signedOut) scheduleSignedOutFallback()
},
{ immediate: true }
)
setTimeout(settle, GATE_SETTLE_TIMEOUT_MS)
}
Loading
Loading