fix(grok): show context-window usage in the composer

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.

[theman6660]

Closes#8382

What Changed

Grok threads never showed the composer context-window meter. The live adapter did not emit thread.token-usage.updated, so ContextWindowMeter had nothing to render.

This maps occupancy onto that existing path:

• ACP sessionUpdate: "usage_update" when present
• Grok's actual path today: session/update_meta.totalTokens
• Window size from _meta (contextWindowTokens / contextWindow / maxTokens), else the current model's availableModels[]._meta.totalContextTokens, else 500k

Interrupted turns do not overwrite the last snapshot. Cursor gets the shared UsageUpdated case so the ACP union stays exhaustive.

No new UI. The existing composer meter is enough.

Why

Codex already shows used / max / %. Grok did not, even though grok agent stdio already streams fill on _meta.totalTokens.

Live Grok ACP still does not send usage_update. Occupancy lives on session/update _meta.totalTokens. Prompt-response usage.totalTokens is billed API tokens, not context fill. On a greeting turn those were 1615 occupancy vs 20554 billed. This PR does not use the prompt-response number, which is the difference from #5405.

UI Changes

Uses the existing context-window meter in the composer.

• Before: Grok threads have no context fill indicator.
• After: After the first occupancy-bearing session/update, Grok shows the same ring + used/max tooltip as Codex.

Validation

• vp test run src/provider/acp/AcpRuntimeModel.test.ts src/provider/acp/AcpCoreRuntimeEvents.test.ts src/provider/acp/GrokAcpSupport.test.ts — 50 passed
• Server typecheck: no new errors
• Live Grok session: _meta.totalTokens is occupancy; prompt usage.totalTokens is billed tokens; signals.json has contextWindowTokens: 500000
• GrokAdapter mock spawn tests fail on this Windows host (spawn EFTYPE on the .sh wrapper). That is existing, not introduced here. The new adapter test is in GrokAdapter.test.ts for Linux CI.

Checklist

• This PR is small and focused
• I explained what changed and why
• I included before/after screenshots for the UI change (happy to add a Grok-thread capture)
• A video is not applicable (no animation/timing change)

---

Note

Low Risk
Provider-adapter and event-mapping changes only; no auth or persistence changes, with deduplication and explicit exclusion of billed-token metadata reducing wrong-meter risk.

Overview
Grok threads can now drive the existing composer context-window meter by emitting thread.token-usage.updated from ACP session traffic, matching what Codex already had.

ACP parsing gains a UsageUpdated path for explicit usage_update notifications and for Grok’s live signal: session/update_meta.totalTokens (with window size from _meta keys or model metadata). Prompt-response _meta.usage.totalTokens is intentionally ignored so billed API tokens are not shown as context fill. makeAcpTokenUsageEvent maps occupancy into the canonical runtime event (positive used tokens only, clamped to max).

GrokAdapter dedupes snapshots, seeds max window from session setup availableModels[]._meta.totalContextTokens, refreshes on model change, and skips updates for interrupted turns. CursorAdapter handles the same UsageUpdated branch for exhaustiveness. The mock ACP agent can simulate occupancy via T3_ACP_EMIT_CONTEXT_USAGE.

^{Reviewed by Cursor Bugbot for commit a2087c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add context-window usage events for Grok ACP adapter

• Adds a canonical makeAcpTokenUsageEvent factory in AcpCoreRuntimeEvents.ts that converts positive usage measurements into thread.token-usage.updated events with rounded, maximum-bounded token counts
• Extends ACP session-update parsing in AcpRuntimeModel.ts to project usage_update notifications and totalTokens metadata into UsageUpdated parsed events
• Builds a model-to-context-window map from Grok session setup metadata in GrokAcpSupport.ts, resolving window sizes by exact model ID or base model ID
• makeGrokAdapter in GrokAdapter.ts now processes UsageUpdated notifications, deduplicates snapshots, refreshes the cached window on model change, and emits token-usage events using the event-provided or model-derived window (default 500,000)
• Risk: parseSessionUpdateEvent now emits UsageUpdated for any session-update containing totalTokens metadata; adapters or consumers that did not expect this event type on session updates need to handle it

^{Macroscope summarized a2087c9.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.

^{Reviewed by Cursor Bugbot for commit 6af161d. Configure here.}

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This change adds a cross-cutting production pipeline that turns ACP session metadata into persisted context-window updates for Grok and Cursor, including a new 500,000-token fallback displayed by the composer meter. A cancellation race can also allow stale usage to overwrite the meter, so the runtime behavior and fallback semantics need human review.

Not approved because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

🟡 MediumLayers/GrokAdapter.ts:1374

A queued UsageUpdated from a cancelled prompt is emitted as thread.token-usage.updated after interruptTurn clears activeTurnId, so stale usage overwrites the composer context meter. Treat usageTurnId === undefined as stale here, in addition to checking interruptedTurnIds.

🤖 Copy this AI Prompt to have your agent fix this:

In file @apps/server/src/provider/Layers/GrokAdapter.ts around line 1374:
A queued `UsageUpdated` from a cancelled prompt is emitted as `thread.token-usage.updated` after `interruptTurn` clears `activeTurnId`, so stale usage overwrites the composer context meter. Treat `usageTurnId === undefined` as stale here, in addition to checking `interruptedTurnIds`.