Hypatia May
cbe36fdd98
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
...
Master independently refreshed the same stale web aria goldens this branch had
absorbed in 08aa0ca54, so every conflict was golden-vs-golden with no source
overlap. Goldens are recorded rather than merged: master's recordings win here,
and the following commit re-records to reapply this branch's one added
occupancy segment on top of them.
2026-07-30 14:49:20 +08:00
Hypatia May
8a8c1965d7
feat(web): show durable token usage and context occupancy in the stats line
...
The chat stats line took its token totals from the loaded conversation nodes,
so paging changed them and compaction erased the billing behind replaced
content. It also had no way to show context occupancy: the numerator and
capacity never reached the browser.
Both now come from token-meter session projections read through the standard
useProjection seat. Window nodes keep supplying turn and step counts plus LLM
and tool wall times, which are correctly window-scoped facts about what is on
screen; accounting no longer comes from there.
`tokenUsage` supplies billing and cache hit. `contextPressure` supplies
occupancy, pairing the newest provider-reported prompt size with the newest
capacity recorded by `request/context`. Deployments without token-meter drop
the token groups; a route whose adapter advertises no capacity drops the
occupancy group rather than rendering a placeholder.
Occupancy is deliberately approximate: the numerator and capacity are
independent last-wins fields, not one atomic request observation, so switching
models pairs a fresh capacity with the prior route's pressure until the next
request reports usage. It is a user-facing reference figure that nothing in the
harness makes decisions from, and it matches how the TUI status line has always
computed occupancy. The Agent Note and token-meter README state this as a
decision, including why the atomic alternative was implemented and rejected, so
it is not re-litigated as a defect.
Snapshot delta is one added `Context N% of 128K` segment across eight web
goldens; the preceding commit absorbed master's pre-existing golden drift.
2026-07-30 14:48:19 +08:00
Hypatia May
7f30a7e30c
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
...
Conflict resolution notes:
- StatsLine: master redesigned the row into pipe-separated groups with LLM and
tool wall times. Kept that design and swapped only the token accounting
source, so counts and durations stay window-scoped while billing and context
occupancy read the durable projections.
- Generated artifacts (cordis catalog, module graph, event producer/consumer,
i18n pairing hashes) and web snapshots took master's side; they are
regenerated and re-recorded after this merge.
- Web e2e goldens and details-panel/timeline assertions took master's side:
that evolution is unrelated to this branch.
- ui-conversation package.json: kept master's devDependency ordering, re-adding
only the token-meter entry this branch needs.
2026-07-30 13:56:39 +08:00
imccyu
b523a04af8
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:51:09 +08:00
imccyu
6303b22487
ci: run web replay on master linux
2026-07-30 11:16:37 +08:00
imccyu
4b4f7752c1
ci: gate web browser snapshots
2026-07-30 10:23:05 +08:00
kingwl
ebbcfdd03b
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# packages/core/agent-loop/src/agent.ts
2026-07-30 03:33:41 +08:00
Tianyi Cui
4582e1425c
Merge commit 'refs/codex/pr885/master-20260730' into worktree/retarget-pr885-20260729
...
# Conflicts:
# eslint.config.mjs
2026-07-30 01:18:28 +08:00
kingwl
76e14793a9
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.i18n.yaml
# docs/event-producer-consumer.md
2026-07-30 01:04:25 +08:00
kingwl
c97b1d025e
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# apps/web/tsconfig.json
# docs/architecture.i18n.yaml
# docs/event-producer-consumer.md
# packages/client/runtime/README.i18n.yaml
# packages/client/tsdown.client.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent/README.i18n.yaml
# packages/core/agent/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# tsconfig.host.json
2026-07-30 00:30:38 +08:00
Tianyi Cui
0440c4cc0c
Merge latest master into codex/migrate-to-oxlint
2026-07-30 00:13:30 +08:00
imccyu
ed1ae0d636
fix: docs budget
2026-07-30 00:12:03 +08:00
kingwl
f893e2281d
feat(agent): add addressable queue operations
2026-07-30 00:05:00 +08:00
imccyu
dcb8b592ee
Merge remote-tracking branch 'origin/master' into worktree-trpc
2026-07-30 00:04:52 +08:00
imccyu
c269febc9a
refactor(cordis): generate catalogs from Typert models
2026-07-29 23:55:12 +08:00
imccyu
f773985e71
feat(typert): add compiler-independent type pipeline
2026-07-29 23:45:42 +08:00
Tianyi Cui
e673524976
refactor: centralize Oxlint worker bounds
2026-07-29 23:39:49 +08:00
Tianyi Cui
fca0c05155
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/skills.i18n.yaml
# docs/core-data-structures/skills.md
# docs/core-data-structures/skills.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/skill/skill-local/README.i18n.yaml
# packages/skill/skill/README.i18n.yaml
# packages/skill/skill/README.md
# packages/skill/skill/README.zh.md
# packages/skill/skill/src/index.ts
# packages/skill/skill/tests/skill.spec.ts
# packages/skill/tool-skill/README.i18n.yaml
# packages/skill/tool-skill/src/index.ts
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/README.md
# packages/ui/tui/README.zh.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.spec.ts
2026-07-29 23:36:49 +08:00
Tianyi Cui
f7ee0bf0fd
fix: allow ignored-only staged lint
2026-07-29 23:36:08 +08:00
Tianyi Cui
8f34131f01
fix: restore unused suppression reports
2026-07-29 23:35:10 +08:00
Tianyi Cui
59940f0863
test: keep lint format rules aligned
2026-07-29 23:34:30 +08:00
Tianyi Cui
fe5d0001ab
test: pin Oxlint compatibility rules
2026-07-29 23:29:59 +08:00
Tianyi Cui
d29c5e0c07
test: prove Oxlint project discovery
2026-07-29 23:28:32 +08:00
Tianyi Cui
df9608c43d
test: make lint profile fingerprint honest
2026-07-29 23:26:16 +08:00
Tianyi Cui
0659151cd5
test: refresh translation prompt snapshot
2026-07-29 22:57:32 +08:00
Tianyi Cui
e91ef39f5a
fix: preserve lint migration contracts
2026-07-29 22:38:20 +08:00
Tianyi Cui
16e1734444
Merge origin/master at 90bc53cc64 into skill catalog hot refresh
2026-07-29 21:43:13 +08:00
Tianyi Cui
502e64c00d
Merge origin/master at ecbf75a5e7 into skill catalog hot refresh
2026-07-29 21:42:18 +08:00
Tianyi Cui
e1984cbfd9
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr885-20260729
2026-07-29 21:40:13 +08:00
Tianyi Cui
32aaa8983e
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr885-20260729
...
# Conflicts:
# docs/development.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-primitives/src/markdown/CodeBlock.tsx
# scripts/snapshots/translation-prompt-v4/request-response.expected.json
2026-07-29 21:37:43 +08:00
Tianyi Cui
754e163663
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:26:44 +08:00
Tianyi Cui
52d68a5383
fix(skill): retain candidates across watcher failures
2026-07-29 21:17:27 +08:00
imccyu
8dca750c8e
Merge branch 'master' into trajectory-history-source
2026-07-29 21:12:31 +08:00
Tianyi Cui
de4f2a12f0
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:06:24 +08:00
Tianyi Cui
5c0c59847b
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
...
# Conflicts:
# packages/client/ui-skill/README.i18n.yaml
# packages/client/ui-skill/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/skill/skill-local/README.i18n.yaml
# packages/skill/skill-local/README.zh.md
# packages/skill/skill/README.i18n.yaml
# packages/skill/skill/README.zh.md
# packages/skill/tool-skill/README.i18n.yaml
2026-07-29 21:05:09 +08:00
imccyu
b23c3d596a
Merge remote-tracking branch 'origin/master' into trajectory-history-source
2026-07-29 20:58:04 +08:00
Tianyi Cui
4368c2d40c
Merge branch 'master' into fix/translation-brief-uncommitted-pair
2026-07-29 20:54:30 +08:00
j-xiang
ed4a6fd026
docs(i18n): address automated review
2026-07-29 17:46:06 +08:00
_Kerman
859452d807
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
...
# Conflicts:
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/error-auth.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/mid-steer.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/runtime/src/client/contract/session.ts
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 17:31:33 +08:00
Tianyi Cui
5bf93e4229
Merge origin/master into worktree/skill-catalog-hot-refresh
2026-07-29 16:40:40 +08:00
j-xiang
94b2862e12
Merge remote-tracking branch 'origin/master' into xjt/readme-proofreading-batch-1
2026-07-29 15:47:00 +08:00
Hypatia May
186198f45d
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
2026-07-29 15:37:22 +08:00
Hypatia May
d20e531153
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
...
# Conflicts:
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/mid-steer.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 15:36:38 +08:00
j-xiang
46e1e86c76
docs(i18n): bind reviewed README terminology
2026-07-29 15:29:03 +08:00
imccyu
4da1026956
Merge branch 'master' into xtr/dsh-source-launch-tsx-esm
2026-07-29 15:29:00 +08:00
Tianyi Cui
2e7ac0d7f2
Merge branch 'master' into agent/fix-copied-worktree-hooks
2026-07-29 14:55:36 +08:00
Turtle
203767cd37
test: prove ESLint to Oxlint rule parity
2026-07-29 14:47:50 +08:00
Turtle
711efc0a8e
Merge remote-tracking branch 'origin/master' into codex/migrate-to-oxlint
2026-07-29 14:32:21 +08:00
Turtle
95a995968b
refactor: migrate linting to Oxlint
2026-07-29 14:32:11 +08:00
Hypatia May
741b760557
Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics
...
# Conflicts:
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# docs/architecture.i18n.yaml
# docs/event-producer-consumer.md
# packages/client/connection/src/client/api.ts
# packages/client/runtime/src/client/index.ts
# packages/client/runtime/src/client/sessions/manager.ts
# packages/client/runtime/src/client/sessions/service.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/tests/chat-toolview-slot.spec.tsx
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
2026-07-29 14:26:43 +08:00
