Merge master into feature/amazonq

Author: aws-toolkit-automation

.changes/next-release/Bug Fix-5d2dc465-bf49-4808-94a1-bf8006af3b96.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "codecatalyst: fix extension activation in new dev environments"
+}

.changes/next-release/Bug Fix-5e2f465c-e15e-4ec9-b60c-053c7046769c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "codecatalyst: fix heartbeat activity registration"
+}

packages/core/src/codecatalyst/auth.ts

@@ -371,17 +371,22 @@ export class CodeCatalystAuthenticationProvider {
         }
     }
 
-    private getState(): Record<string, ConnectionState> {
+    private getStates(): Record<string, ConnectionState> {
         return this.memento.get(this.mementoKey, {} as Record<string, ConnectionState>)
     }
 
     public getConnectionState(conn: SsoConnection): ConnectionState {
-        return this.getState()[conn.id]
+        return (
+            this.getStates()[conn.id] ?? {
+                onboarded: false,
+                scopeExpired: false,
+            }
+        )
     }
 
     private async setConnectionState(conn: SsoConnection, state: ConnectionState) {
         await this.memento.update(this.mementoKey, {
-            ...this.getState(),
+            ...this.getStates(),
             [conn.id]: state,
         })
     }