From c6f78a715f6ea2d8ccb7d4f4ba9e8fe8ddeeb3ff Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <jmkeyes@amazon.com>
Date: Fri, 11 Oct 2024 12:38:32 -0700
Subject: [PATCH 1/2] telemetry: toolkit_showNotification.userChoice

---
 telemetry/definitions/commonDefinitions.json | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json
index 203ff69a..76fbd9b1 100644
--- a/telemetry/definitions/commonDefinitions.json
+++ b/telemetry/definitions/commonDefinitions.json
@@ -3,7 +3,7 @@
         {
             "name": "action",
             "type": "string",
-            "description": "Name of an action that was taken, displayed, etc."
+            "description": "Name of an action that was taken, displayed, etc. See also `userChoice`."
         },
         {
             "name": "amazonqCodeGenerationResult",
@@ -1711,7 +1711,7 @@
         {
             "name": "userChoice",
             "type": "string",
-            "description": "User selection from a predefined menu (not user-provided input)"
+            "description": "User selection from a predefined menu (not user-provided input). See also `action`."
         },
         {
             "name": "userId",
@@ -6794,7 +6794,7 @@
         },
         {
             "name": "toolkit_openModule",
-            "description": "The user opened 'something' (specified by 'module'). Examples: a view, feature, resource, ...",
+            "description": "User opened 'something' (specified by 'module'). Examples: a view, feature, resource, ...",
             "metadata": [
                 {
                     "type": "module",
@@ -6813,7 +6813,7 @@
         },
         {
             "name": "toolkit_showAction",
-            "description": "The toolkit tried to show an action. Source represents the notification that produced the action",
+            "description": "Toolkit presented an action. `source` is the notification that produced the action. See also `toolkit_showNotification`.",
             "metadata": [
                 {
                     "type": "component",
@@ -6840,7 +6840,7 @@
         },
         {
             "name": "toolkit_showNotification",
-            "description": "The toolkit tried to show a notification message",
+            "description": "Show a notification message, optionally with selected action set in `userChoice`. See also `toolkit_showAction`.",
             "metadata": [
                 {
                     "type": "component",
@@ -6850,6 +6850,10 @@
                     "type": "id",
                     "required": true
                 },
+                {
+                    "type": "userChoice",
+                    "required": false
+                },
                 {
                     "type": "reason",
                     "required": false
@@ -6942,4 +6946,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}

From 05aae81a47b53e0ae4694e42520d9bcd7196a492 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <jmkeyes@amazon.com>
Date: Fri, 11 Oct 2024 13:07:24 -0700
Subject: [PATCH 2/2] fixup! telemetry: toolkit_showNotification.userChoice

---
 telemetry/definitions/commonDefinitions.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json
index 76fbd9b1..36c8c84f 100644
--- a/telemetry/definitions/commonDefinitions.json
+++ b/telemetry/definitions/commonDefinitions.json
@@ -6850,10 +6850,6 @@
                     "type": "id",
                     "required": true
                 },
-                {
-                    "type": "userChoice",
-                    "required": false
-                },
                 {
                     "type": "reason",
                     "required": false
@@ -6861,6 +6857,10 @@
                 {
                     "type": "result",
                     "required": true
+                },
+                {
+                    "type": "userChoice",
+                    "required": false
                 }
             ],
             "passive": true