@solongate/proxy 0.83.68 → 0.83.70

package/hooks/conversation.mjs

@@ -297,9 +297,8 @@ function readClaudeCode(transcriptPath) {
  * for the session, and sending cumulative values to a store that adds rows
  * would count the whole session again on every turn.
  */
-function readCodex(transcriptPath) {
+function readCodex(transcriptPath, sessionId) {
   const out = [];
-  let ordinal = 0;
   for (const line of tailLines(transcriptPath)) {
     if (!line || line[0] !== '{') continue;
     let r;
@@ -308,19 +307,27 @@ function readCodex(transcriptPath) {
     const p = r.payload;
     if (!p || p.type !== 'token_count') continue;
 
-    ordinal++;
     const last = p.info && p.info.last_token_usage;
     if (!last) continue;
 
     const total = num(last.total_tokens) || (num(last.input_tokens) + num(last.output_tokens));
     if (total <= 0) continue;
 
+    // The record's OWN ordinal, never a count of what this read happened to
+    // see. Counting within the tail renumbers every event the moment the file
+    // grows past the window — the same turn gets a new key, and a new key is a
+    // second row. Older rollouts carry no ordinal, so those fall back to the
+    // timestamp paired with the running total, which together do not repeat.
+    const id = typeof r.ordinal === 'number'
+      ? 'o:' + r.ordinal
+      : 't:' + (r.timestamp || '') + ':' + num((p.info.total_token_usage || {}).total_tokens);
+
     out.push({
-      // The rollout file is append-only and the events are in order, so the
-      // count of token_count events before this one is stable across re-reads
-      // of the same file. Paired with the timestamp so a truncated tail cannot
-      // renumber a turn that was already sent.
-      turn_key: 'tc:' + ordinal + ':' + (r.timestamp || ''),
+      // Prefixed with the session, because an ordinal is only unique WITHIN a
+      // rollout. The server's key does not include the session — resuming a
+      // conversation would otherwise double every turn it copies forward — so
+      // a positional id has to carry its own scope.
+      turn_key: (sessionId || 'codex') + ':' + id,
       // input_tokens INCLUDES cached here, and output INCLUDES reasoning —
       // the opposite of Claude Code's disjoint buckets. The total is the
       // provider's own, so the difference never has to be reconciled.
@@ -437,9 +444,10 @@ function readAntigravity(conversationId) {
       if (input + output <= 0) continue;
 
       out.push({
-        // The generation index, which is this client's own identifier for the
-        // model call and is stable across re-reads of the same conversation.
-        turn_key: 'gen:' + row.idx,
+        // The generation index, prefixed with the conversation it counts
+        // within: an index is only unique inside one database, and the
+        // server's key does not include the session.
+        turn_key: conversationId + ':gen:' + row.idx,
         input,
         output,
         // The cached half of the prompt, which Antigravity reports separately
@@ -476,7 +484,11 @@ function collectTokens(data, source) {
     return readAntigravity(id);
   }
   if (!transcript || !existsSync(transcript)) return [];
-  if (source === 'codex') return readCodex(transcript);
+  const sessionId = data.session_id || data.sessionId || '';
+  if (source === 'codex') return readCodex(transcript, sessionId);
+  // Claude Code needs no prefix: requestId is provider-issued and unique
+  // across every transcript, which is exactly what makes a resumed session
+  // report the same turn once rather than twice.
   return readClaudeCode(transcript);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solongate/proxy",
-  "version": "0.83.68",
+  "version": "0.83.70",
   "description": "AI tool security proxy: protect any AI tool server with customizable policies, path/command constraints, rate limiting, and audit logging. No code changes required.",
   "type": "module",
   "bin": {
@@ -61,12 +61,12 @@
     "node": ">=20.0.0"
   },
   "optionalDependencies": {
-    "@solongate/guard-linux-x64": "0.83.68",
-    "@solongate/guard-linux-arm64": "0.83.68",
-    "@solongate/guard-darwin-x64": "0.83.68",
-    "@solongate/guard-darwin-arm64": "0.83.68",
-    "@solongate/guard-win32-x64": "0.83.68",
-    "@solongate/guard-win32-arm64": "0.83.68"
+    "@solongate/guard-linux-x64": "0.83.70",
+    "@solongate/guard-linux-arm64": "0.83.70",
+    "@solongate/guard-darwin-x64": "0.83.70",
+    "@solongate/guard-darwin-arm64": "0.83.70",
+    "@solongate/guard-win32-x64": "0.83.70",
+    "@solongate/guard-win32-arm64": "0.83.70"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",