fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(usage): stop counting replayed codex rollout heads - #5701

Closed
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads
Closed

fix(usage): stop counting replayed codex rollout heads#5701
xkelxmc wants to merge 2 commits into
pingdotgg:mainfrom
xkelxmc:fix/codex-replayed-rollout-heads

Conversation

@xkelxmc

@xkelxmcxkelxmc commented Aug 8, 2026

Copy link
Copy Markdown

What changed

Codex usage scanning now drops the replayed head of a rollout file before aggregation.

  • usageTranscripts.ts — new pure dropReplayedRolloutHead: a file whose records open with token_count events spaced under a second apart replayed a history it did not spend; the burst is dropped up to the first real pause. A lone leading event, or a head that opens at working pace, is left alone.
  • UsageService.ts — applies it to Codex files, after the scan cache on purpose (cached entries keep the raw records, so the heuristic can evolve without a cache version bump).

Why it should exist

parseCodexLine currently returns dedupeKey: null with the comment "rollout files are unique per session, so events need no global dedup" — and that assumption doesn't hold. Resuming a session, forking it, and every subagent it spawns replay the entire conversation so far into a fresh rollout file, token_count events included, with fresh timestamps. So there is no key and no clock to dedupe on, and the existing consecutive-duplicate filter (single-slot, per file) cannot see copies that live in another file. Every replayed event is counted again, and lands on the day the resume happened.

The write pattern is what identifies a copy: replayed history is flushed in one sub-second burst at the head of the file, while real work has pauses between turns — a genuine first turn never emits two token_counts within a second of each other. On our logs the double counting is far from cosmetic: days with heavy resume/subagent use read ~1.5× their true Codex volume, and a 90-day window read roughly a third high.

Notes

  • A fully-replayed file (a fork that has done nothing of its own yet) drops to zero records and counts as a skipped file.
  • A follow-up could anchor the head against the parent rollout via session_meta's forked_from_id / parent_thread_id for exact prefix matching; the burst rule alone already removes the bulk of the double counting with far less machinery.

Note

Medium Risk
Changes reported Codex token/session totals (often downward) via a timing heuristic; wrong classification could under- or over-count, but scope is limited to usage aggregation and is covered by unit tests.

Overview
Codex usage scanning now strips replayed rollout heads before aggregation so resume/fork/subagent copies of prior token_count events are not counted again.

Adds dropReplayedRolloutHead in usageTranscripts.ts: if a file’s records start with consecutive events less than 1 second apart, that prefix is treated as copied history and dropped up to the first real pause; a single leading event or a head that already opens at working pace is unchanged. Comments on Codex dedupeKey now point at this path instead of assuming one rollout per session.

UsageService runs the filter only for Codex, after the per-file scan cache returns parsed records, so cached payloads stay raw and the heuristic can change without a cache version bump. Files that become empty after filtering count as skipped.

Reviewed by Cursor Bugbot for commit 6b034bc. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix usage counting by filtering replayed rollout heads from Codex transcripts

  • Introduces dropReplayedRolloutHead in usageTranscripts.ts, which removes the leading burst of events where consecutive gaps are under 1,000 ms — the signature of a replayed rollout head.
  • UsageService now applies this filter for provider === "codex" before counting records toward usage, sessions, and costs.
  • Behavioral Change: Codex usage counts will decrease for any session that previously included replayed rollout head events.

Macroscope summarized 6b034bc.

@coderabbitai

coderabbitaiBot commented Aug 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dcf549ac-173b-406b-95a0-c9af15899642

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 8, 2026
Comment threadapps/server/src/usage/usageTranscripts.ts Outdated
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Needs human review

This PR modifies usage metering logic to filter out replayed Codex rollout records based on timing heuristics. Changes that affect how usage/tokens are counted warrant human review to verify the filtering logic correctly identifies duplicates without dropping legitimate usage.

You can customize Macroscope's approvability policy. Learn more.

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

Closing because this timing-only filter can discard genuine usage from ordinary Codex sessions. #5887 already added replay suppression that first checks fork or subagent metadata. Any remaining overcount should be shown with a transcript so we can fix that case without removing valid records.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed. If GitHub does not let you reopen it, leave a comment here and we'll take another look.

@t3dotggt3dotgg closed this Aug 27, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M30-99 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xkelxmc@t3dotgg