Merge branch 'main' into finks/default-custom

Author: manodnyab

.changes/next-release/bugfix-6a2d9629-1cc1-4143-8950-cfd117fcabe3.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Fix issue when files are deleted while preparing context"
+}

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationStateUtils.kt

@@ -4,15 +4,14 @@
 package software.aws.toolkits.jetbrains.core.notifications
 
 import com.intellij.openapi.components.PersistentStateComponent
-import com.intellij.openapi.components.RoamingType
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.service
 import software.aws.toolkits.core.utils.ETagProvider
 
 @Service
-@State(name = "notificationDismissals", storages = [Storage("aws.xml", roamingType = RoamingType.DISABLED)])
+@State(name = "notificationDismissals", storages = [Storage("aws.xml")])
 class NotificationDismissalState : PersistentStateComponent<NotificationDismissalConfiguration> {
     private val state = NotificationDismissalConfiguration()
 
@@ -41,7 +40,7 @@ data class NotificationDismissalConfiguration(
 )
 
 @Service
-@State(name = "notificationEtag", storages = [Storage("aws.xml", roamingType = RoamingType.DISABLED)])
+@State(name = "notificationEtag", storages = [Storage("aws.xml")])
 class NotificationEtagState : PersistentStateComponent<NotificationEtagConfiguration>, ETagProvider {
     private val state = NotificationEtagConfiguration()
 

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

@@ -189,8 +189,12 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
 
         createTemporaryZipFileAsync { zipOutput ->
             filesToIncludeFlow.collect { file ->
-                val relativePath = Path(file.path).relativeTo(projectRoot.toNioPath())
-                zipOutput.putNextEntry(relativePath.toString(), Path(file.path))
+                try {
+                    val relativePath = Path(file.path).relativeTo(projectRoot.toNioPath())
+                    zipOutput.putNextEntry(relativePath.toString(), Path(file.path))
+                } catch (e: NoSuchFileException) {
+                    // Noop: Skip if file was deleted
+                }
             }
         }
     }.toFile()