Merge branch 'rhan/oob-turn-metadata' into rhan/oob-queue-data

codex-rs/app-server-protocol/schema/json/ServerNotification.json

@@ -3367,6 +3367,19 @@
     },
     "TurnCompletedNotification": {
       "properties": {
+        "completedAt": {
+          "description": "Unix timestamp (in seconds) when the turn completed.",
+          "format": "int64",
+          "type": "integer"
+        },
+        "durationMs": {
+          "description": "Duration between turn start and completion in milliseconds, if known.",
+          "format": "int64",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
         "threadId": {
           "type": "string"
         },
@@ -3375,6 +3388,7 @@
         }
       },
       "required": [
+        "completedAt",
         "threadId",
         "turn"
       ],
@@ -3481,6 +3495,11 @@
     },
     "TurnStartedNotification": {
       "properties": {
+        "createdAt": {
+          "description": "Unix timestamp (in seconds) when the turn started.",
+          "format": "int64",
+          "type": "integer"
+        },
         "threadId": {
           "type": "string"
         },
@@ -3489,6 +3508,7 @@
         }
       },
       "required": [
+        "createdAt",
         "threadId",
         "turn"
       ],

codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json

@@ -14181,6 +14181,19 @@
       "TurnCompletedNotification": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "properties": {
+          "completedAt": {
+            "description": "Unix timestamp (in seconds) when the turn completed.",
+            "format": "int64",
+            "type": "integer"
+          },
+          "durationMs": {
+            "description": "Duration between turn start and completion in milliseconds, if known.",
+            "format": "int64",
+            "type": [
+              "integer",
+              "null"
+            ]
+          },
           "threadId": {
             "type": "string"
           },
@@ -14189,6 +14202,7 @@
           }
         },
         "required": [
+          "completedAt",
           "threadId",
           "turn"
         ],
@@ -14468,6 +14482,11 @@
       "TurnStartedNotification": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "properties": {
+          "createdAt": {
+            "description": "Unix timestamp (in seconds) when the turn started.",
+            "format": "int64",
+            "type": "integer"
+          },
           "threadId": {
             "type": "string"
           },
@@ -14476,6 +14495,7 @@
           }
         },
         "required": [
+          "createdAt",
           "threadId",
           "turn"
         ],

codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json

@@ -12027,6 +12027,19 @@
     "TurnCompletedNotification": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "properties": {
+        "completedAt": {
+          "description": "Unix timestamp (in seconds) when the turn completed.",
+          "format": "int64",
+          "type": "integer"
+        },
+        "durationMs": {
+          "description": "Duration between turn start and completion in milliseconds, if known.",
+          "format": "int64",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
         "threadId": {
           "type": "string"
         },
@@ -12035,6 +12048,7 @@
         }
       },
       "required": [
+        "completedAt",
         "threadId",
         "turn"
       ],
@@ -12314,6 +12328,11 @@
     "TurnStartedNotification": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "properties": {
+        "createdAt": {
+          "description": "Unix timestamp (in seconds) when the turn started.",
+          "format": "int64",
+          "type": "integer"
+        },
         "threadId": {
           "type": "string"
         },
@@ -12322,6 +12341,7 @@
         }
       },
       "required": [
+        "createdAt",
         "threadId",
         "turn"
       ],

codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json

@@ -1559,6 +1559,19 @@
     }
   },
   "properties": {
+    "completedAt": {
+      "description": "Unix timestamp (in seconds) when the turn completed.",
+      "format": "int64",
+      "type": "integer"
+    },
+    "durationMs": {
+      "description": "Duration between turn start and completion in milliseconds, if known.",
+      "format": "int64",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
     "threadId": {
       "type": "string"
     },
@@ -1567,6 +1580,7 @@
     }
   },
   "required": [
+    "completedAt",
     "threadId",
     "turn"
   ],

codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json

@@ -1559,6 +1559,11 @@
     }
   },
   "properties": {
+    "createdAt": {
+      "description": "Unix timestamp (in seconds) when the turn started.",
+      "format": "int64",
+      "type": "integer"
+    },
     "threadId": {
       "type": "string"
     },
@@ -1567,6 +1572,7 @@
     }
   },
   "required": [
+    "createdAt",
     "threadId",
     "turn"
   ],

codex-rs/app-server-protocol/schema/typescript/v2/TurnCompletedNotification.ts

@@ -3,4 +3,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Turn } from "./Turn";
 
-export type TurnCompletedNotification = { threadId: string, turn: Turn, };
+export type TurnCompletedNotification = { threadId: string, turn: Turn, 
+/**
+ * Unix timestamp (in seconds) when the turn completed.
+ */
+completedAt: number, 
+/**
+ * Duration between turn start and completion in milliseconds, if known.
+ */
+durationMs: number | null, };

codex-rs/app-server-protocol/schema/typescript/v2/TurnStartedNotification.ts

@@ -3,4 +3,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Turn } from "./Turn";
 
-export type TurnStartedNotification = { threadId: string, turn: Turn, };
+export type TurnStartedNotification = { threadId: string, turn: Turn, 
+/**
+ * Unix timestamp (in seconds) when the turn started.
+ */
+createdAt: number, };

codex-rs/core/src/codex.rs

@@ -54,6 +54,12 @@ use async_channel::Receiver;
 use async_channel::Sender;
 use chrono::Local;
 use chrono::Utc;
+use codex_analytics::AnalyticsEventsClient;
+use codex_analytics::AppInvocation;
+use codex_analytics::InvocationType;
+use codex_analytics::TurnResolvedConfigFact;
+use codex_analytics::TurnSubmissionType;
+use codex_analytics::build_track_events_context;
 use codex_app_server_protocol::McpServerElicitationRequest;
 use codex_app_server_protocol::McpServerElicitationRequestParams;
 use codex_exec_server::Environment;
@@ -354,12 +360,6 @@ use crate::turn_timing::record_turn_ttft_metric;
 use crate::unified_exec::UnifiedExecProcessManager;
 use crate::util::backoff;
 use crate::windows_sandbox::WindowsSandboxLevelExt;
-use codex_analytics::AnalyticsEventsClient;
-use codex_analytics::AppInvocation;
-use codex_analytics::InvocationType;
-use codex_analytics::TurnResolvedConfigFact;
-use codex_analytics::TurnSubmissionType;
-use codex_analytics::build_track_events_context;
 use codex_async_utils::OrCancelExt;
 use codex_git_utils::get_git_repo_root;
 use codex_otel::SessionTelemetry;
@@ -6226,6 +6226,7 @@ pub(crate) async fn run_turn(
             }
         }
     }
+
     last_agent_message
 }