diff --git a/scripts/snapshots/python-sdk-single-exe/advanced/result.json b/scripts/snapshots/python-sdk-single-exe/advanced/result.json
index 36c51fe50a..59860b2c2a 100644
--- a/scripts/snapshots/python-sdk-single-exe/advanced/result.json
+++ b/scripts/snapshots/python-sdk-single-exe/advanced/result.json
@@ -1547,15 +1547,24 @@
       }
     },
     {
-      "type": "feedback/message-put",
+      "type": "feedback/record",
       "seq": 67,
       "time": 0,
+      "data": {
+        "category": "other"
+      }
+    },
+    {
+      "type": "feedback/message-put",
+      "seq": 68,
+      "time": 0,
       "data": {
         "sessionId": "{{parent}}",
         "item": {
           "messageId": "{{message:1}}",
           "rating": "negative",
           "note": "Explain the result.",
+          "category": "task-result",
           "version": "{{feedback-version:1}}",
           "createdAt": 0,
           "updatedAt": 0
@@ -1564,7 +1573,7 @@
     },
     {
       "type": "feedback/message-put",
-      "seq": 68,
+      "seq": 69,
       "time": 0,
       "data": {
         "sessionId": "{{parent}}",
@@ -1580,7 +1589,7 @@
     },
     {
       "type": "feedback/message-delete",
-      "seq": 69,
+      "seq": 70,
       "time": 0,
       "data": {
         "sessionId": "{{parent}}",
@@ -1589,7 +1598,7 @@
     },
     {
       "type": "turn/end",
-      "seq": 70,
+      "seq": 71,
       "time": 0,
       "data": {
         "turn": 1,
@@ -4451,15 +4460,30 @@
       "payload": {
         "sessionId": "{{parent}}",
         "event": {
-          "type": "feedback/message-put",
+          "type": "feedback/record",
           "seq": 67,
           "time": 0,
+          "data": {
+            "category": "other"
+          }
+        }
+      }
+    },
+    {
+      "method": "session.event",
+      "payload": {
+        "sessionId": "{{parent}}",
+        "event": {
+          "type": "feedback/message-put",
+          "seq": 68,
+          "time": 0,
           "data": {
             "sessionId": "{{parent}}",
             "item": {
               "messageId": "{{message:1}}",
               "rating": "negative",
               "note": "Explain the result.",
+              "category": "task-result",
               "version": "{{feedback-version:1}}",
               "createdAt": 0,
               "updatedAt": 0
@@ -4474,7 +4498,7 @@
         "sessionId": "{{parent}}",
         "event": {
           "type": "feedback/message-put",
-          "seq": 68,
+          "seq": 69,
           "time": 0,
           "data": {
             "sessionId": "{{parent}}",
@@ -4496,7 +4520,7 @@
         "sessionId": "{{parent}}",
         "event": {
           "type": "feedback/message-delete",
-          "seq": 69,
+          "seq": 70,
           "time": 0,
           "data": {
             "sessionId": "{{parent}}",
@@ -4511,7 +4535,7 @@
         "sessionId": "{{parent}}",
         "event": {
           "type": "turn/end",
-          "seq": 70,
+          "seq": 71,
           "time": 0,
           "data": {
             "turn": 1,
diff --git a/scripts/snapshots/python-sdk-single-exe/advanced/session.v3.jsonl b/scripts/snapshots/python-sdk-single-exe/advanced/session.v3.jsonl
index 2df45edf5b..0e056a97b6 100644
--- a/scripts/snapshots/python-sdk-single-exe/advanced/session.v3.jsonl
+++ b/scripts/snapshots/python-sdk-single-exe/advanced/session.v3.jsonl
@@ -66,7 +66,8 @@
 {"type":"command/run","data":{"commandId":"{{command:1}}","name":"feedback","source":{"kind":"user"}}}
 {"type":"feedback/record","data":{"text":"The session needs a clearer explanation."}}
 {"type":"command/done","data":{"commandId":"{{command:1}}","kind":"success","text":"Feedback recorded for session {{parent}}\nAnonymous user: {{anonymous-user}}."}}
-{"type":"feedback/message-put","data":{"sessionId":"{{parent}}","item":{"messageId":"{{message:1}}","rating":"negative","note":"Explain the result.","version":"{{feedback-version:1}}","createdAt":0,"updatedAt":0}}}
+{"type":"feedback/record","data":{"category":"other"}}
+{"type":"feedback/message-put","data":{"sessionId":"{{parent}}","item":{"messageId":"{{message:1}}","rating":"negative","note":"Explain the result.","category":"task-result","version":"{{feedback-version:1}}","createdAt":0,"updatedAt":0}}}
 {"type":"feedback/message-put","data":{"sessionId":"{{parent}}","item":{"messageId":"{{message:1}}","rating":"positive","note":"The explanation is clear now.","version":"{{feedback-version:2}}","createdAt":0,"updatedAt":0}}}
 {"type":"feedback/message-delete","data":{"sessionId":"{{parent}}","messageId":"{{message:1}}"}}
 {"type":"turn/end","data":{"turn":1,"reason":{"kind":"completed"}}}
diff --git a/snapshots/sdk/text-turn/notifications.expected.jsonl b/snapshots/sdk/text-turn/notifications.expected.jsonl
index 484bd71dbf..c5167d049e 100644
--- a/snapshots/sdk/text-turn/notifications.expected.jsonl
+++ b/snapshots/sdk/text-turn/notifications.expected.jsonl
@@ -15,8 +15,9 @@
 {"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"command/run","seq":16,"time":0,"data":{"commandId":"{{command:1}}","name":"feedback","source":{"kind":"user"}}}}}
 {"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/record","seq":17,"time":0,"data":{"text":"The session needs a clearer explanation."}}}}
 {"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"command/done","seq":18,"time":0,"data":{"commandId":"{{command:1}}","kind":"success","text":"Feedback recorded for session {{session:1}}\nAnonymous user: {{id:1}}."}}}}
-{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/message-put","seq":19,"time":0,"data":{"sessionId":"{{session:1}}","item":{"messageId":"{{message:4}}","rating":"negative","note":"Explain the result.","version":"{{id:2}}","createdAt":0,"updatedAt":0}}}}}
-{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/message-put","seq":20,"time":0,"data":{"sessionId":"{{session:1}}","item":{"messageId":"{{message:4}}","rating":"positive","note":"The explanation is clear now.","version":"{{id:3}}","createdAt":0,"updatedAt":0}}}}}
-{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/message-delete","seq":21,"time":0,"data":{"sessionId":"{{session:1}}","messageId":"{{message:4}}"}}}}
-{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"turn/end","seq":22,"time":0,"data":{"turn":1,"reason":{"kind":"completed"}}}}}
+{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/record","seq":19,"time":0,"data":{"category":"other"}}}}
+{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/message-put","seq":20,"time":0,"data":{"sessionId":"{{session:1}}","item":{"messageId":"{{message:4}}","rating":"negative","note":"Explain the result.","category":"task-result","version":"{{id:2}}","createdAt":0,"updatedAt":0}}}}}
+{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/message-put","seq":21,"time":0,"data":{"sessionId":"{{session:1}}","item":{"messageId":"{{message:4}}","rating":"positive","note":"The explanation is clear now.","version":"{{id:3}}","createdAt":0,"updatedAt":0}}}}}
+{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"feedback/message-delete","seq":22,"time":0,"data":{"sessionId":"{{session:1}}","messageId":"{{message:4}}"}}}}
+{"method":"session.event","params":{"sessionId":"{{session:1}}","event":{"type":"turn/end","seq":23,"time":0,"data":{"turn":1,"reason":{"kind":"completed"}}}}}
 {"method":"session.status","params":{"sessionId":"{{session:1}}","status":"idle"}}
diff --git a/snapshots/sdk/text-turn/session.v3.jsonl b/snapshots/sdk/text-turn/session.v3.jsonl
index a15a0502ea..07f6144d19 100644
--- a/snapshots/sdk/text-turn/session.v3.jsonl
+++ b/snapshots/sdk/text-turn/session.v3.jsonl
@@ -13,12 +13,13 @@
 {"type":"request/context","data":{"provider":"deepseek-official","model":"deepseek-v4-flash"}}
 {"type":"session/title","data":{"title":"Reply with exactly: SDK snapshot","messageSeqs":[8],"source":{"kind":"fallback"}}}
 {"type":"session-log-deepseek/delivery-accepted","data":{"sessionId":"{{session:1}}","sessionFormatVersion":3,"throughSeq":12}}
-{"type":"assistant/message","data":{"turn":1,"step":1,"message":{"role":"assistant","content":[{"type":"reasoning","text":"The user wants me to reply with exactly \"SDK snapshot OK\". Let me do that."},{"type":"text","text":"SDK snapshot OK"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{message:4}}"},"usage":{"inputTokens":1769,"outputTokens":24,"cacheReadTokens":0,"reasoningTokens":19},"stream":[{"type":"chunk","time":1788699467572,"chunk":{"type":"block-start","index":0,"blockType":"reasoning"}},{"type":"reasoning-chunks","time0":1788699467572,"index":0,"dt":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"texts":["The"," user"," wants"," me"," to"," reply"," with"," exactly"," \"","SD","K"," snapshot"," OK","\"."," Let"," me"," do"," that","."]},{"type":"chunk","time":1788699467573,"chunk":{"type":"block-start","index":1,"blockType":"text"}},{"type":"text-chunks","time0":1788699467573,"index":1,"dt":[0,0,0],"texts":["SD","K"," snapshot"," OK"]},{"type":"chunk","time":1788699467573,"chunk":{"type":"block-end","index":0,"block":{"type":"reasoning","text":"The user wants me to reply with exactly \"SDK snapshot OK\". Let me do that."}}},{"type":"chunk","time":1788699467573,"chunk":{"type":"block-end","index":1,"block":{"type":"text","text":"SDK snapshot OK"}}},{"type":"chunk","time":1788699467573,"chunk":{"type":"usage","usage":{"inputTokens":1769,"outputTokens":24,"cacheReadTokens":0,"reasoningTokens":19}}},{"type":"chunk","time":1788699467573,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"}
+{"type":"assistant/message","data":{"turn":1,"step":1,"message":{"role":"assistant","content":[{"type":"reasoning","text":"The user wants me to reply with exactly \"SDK snapshot OK\". Let me do that."},{"type":"text","text":"SDK snapshot OK"}],"source":{"kind":"model","provider":"deepseek-official","model":"deepseek-v4-flash"},"id":"{{message:4}}"},"usage":{"inputTokens":1769,"outputTokens":24,"cacheReadTokens":0,"reasoningTokens":19},"stream":[{"type":"chunk","time":1788920606647,"chunk":{"type":"block-start","index":0,"blockType":"reasoning"}},{"type":"reasoning-chunks","time0":1788920606647,"index":0,"dt":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"texts":["The"," user"," wants"," me"," to"," reply"," with"," exactly"," \"","SD","K"," snapshot"," OK","\"."," Let"," me"," do"," that","."]},{"type":"chunk","time":1788920606647,"chunk":{"type":"block-start","index":1,"blockType":"text"}},{"type":"text-chunks","time0":1788920606647,"index":1,"dt":[0,0,0],"texts":["SD","K"," snapshot"," OK"]},{"type":"chunk","time":1788920606647,"chunk":{"type":"block-end","index":0,"block":{"type":"reasoning","text":"The user wants me to reply with exactly \"SDK snapshot OK\". Let me do that."}}},{"type":"chunk","time":1788920606647,"chunk":{"type":"block-end","index":1,"block":{"type":"text","text":"SDK snapshot OK"}}},{"type":"chunk","time":1788920606647,"chunk":{"type":"usage","usage":{"inputTokens":1769,"outputTokens":24,"cacheReadTokens":0,"reasoningTokens":19}}},{"type":"chunk","time":1788920606647,"chunk":{"type":"finish","reason":{"kind":"stop"}}}]},"surfaceOp":"append"}
 {"type":"step/end","data":{"turn":1,"step":1}}
 {"type":"command/run","data":{"commandId":"{{command:1}}","name":"feedback","source":{"kind":"user"}}}
 {"type":"feedback/record","data":{"text":"The session needs a clearer explanation."}}
 {"type":"command/done","data":{"commandId":"{{command:1}}","kind":"success","text":"Feedback recorded for session {{session:1}}\nAnonymous user: {{id:1}}."}}
-{"type":"feedback/message-put","data":{"sessionId":"{{session:1}}","item":{"messageId":"{{message:4}}","rating":"negative","note":"Explain the result.","version":"{{id:2}}","createdAt":0,"updatedAt":0}}}
+{"type":"feedback/record","data":{"category":"other"}}
+{"type":"feedback/message-put","data":{"sessionId":"{{session:1}}","item":{"messageId":"{{message:4}}","rating":"negative","note":"Explain the result.","category":"task-result","version":"{{id:2}}","createdAt":0,"updatedAt":0}}}
 {"type":"feedback/message-put","data":{"sessionId":"{{session:1}}","item":{"messageId":"{{message:4}}","rating":"positive","note":"The explanation is clear now.","version":"{{id:3}}","createdAt":0,"updatedAt":0}}}
 {"type":"feedback/message-delete","data":{"sessionId":"{{session:1}}","messageId":"{{message:4}}"}}
 {"type":"turn/end","data":{"turn":1,"reason":{"kind":"completed"}}}