sync(upstream): merge upstream/main a20923ce4 into fork/dev

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3

[omegent-app]

Adopts upstream through a20923ce4 — the three commits after #381.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Commit
a20923ce4	fix(web): usage chart no longer makes Claude look like the bigger spender (pingdotgg#5697)
8101cd044	feat(usage): usage page reading provider transcripts across environments (pingdotgg#5684)
30164cb1b	feat(mobile): one sheet for model and thread settings (pingdotgg#5625)

Resolutions

Where	Situation	Resolution
server.ts, ws.ts, client-runtime/state/server.ts	upstream's new UsageService and usageSummary atom family land beside the fork's diagnostics services (HostResourceProbe, ProcessResourceMonitor, TraceDiagnostics, BackgroundPolicy) and its hostResourceSnapshot family	unioned — independent additions in the same layer lists
ThreadComposer	pingdotgg#5625 folds the model picker and provider options into a single settings sheet, replacing the fork's ControlPillMenu — which is where the fork surfaced per-model provider usage (icon marker + quota percentage notes)	sheet adopted; the fork's usage signal moved onto its trigger, which keeps ProviderUsageIcon with the live marker instead of upstream's plain ProviderIcon, so quota state stays visible at a glance
collapsed composer pill	fork-only affordance (upstream has none) that opened the retired model menu	repointed at the same settings sheet, keeping its usage-marked icon
routeTree.gen.ts	generated file, both sides added routes	unioned; typecheck confirms the tree matches the routes that exist

Adversarial review

grok-4.5 over the git show --cc surface with worktree access. Clean on: the diagnostics
services and hostResourceSnapshot surviving the union; the UsageService weld (layer provided,
RPC + auth scope + atom + consumers intact); the sheet open path from both collapsed and expanded
composer without double-presenting (open no-ops while active, and isExpanded makes the two
mutually exclusive); live usage data reaching the marker; routeTree.gen.ts matching the real
routes; and tests retargeted rather than stubbed.

Finding	Disposition
LOW — retiring the model menu orphaned the fork's numeric usage note: the marker survived on the trigger icon, but the quota percentage the menu rows carried had no home, leaving currentUsageNote as dead logic	Fixed. The percentage now hangs off the trigger label, so both halves of the fork's usage signal survive the consolidation
LOW — ProviderIcon import left dangling after the trigger switched to ProviderUsageIcon	Fixed. Removed

Verification

• Full recursive typecheck clean across 17 packages.
• 2,318 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3