2b02202ba1
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-08-03 18:18:25 +08:00
5884a44e6b
docs(ui): clarify approval wait ownership
2026-08-03 02:43:27 -07:00
19f2c45bb0
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 16:38:12 +08:00
140fdef85e
docs(client-web): sync the web card contracts to the scrolling source list
...
The READMEs of ui-primitives and ui-conversation still documented the
removed maxSources prop, DEFAULT_WEB_MAX_SOURCES, CHAT_WEB_MAX_SOURCES,
and the head/tail collapse; the 2026-07-30 frontend note described the
same as current behavior. Restate all of them as the fixed-height scroll
container and cross-link the two notes both ways.
Bound the model-visible/card-visible correspondence: spill-policy's
tools/post-execute replaces an oversized result's content while leaving
presentationMeta whole, so the card's contract is the view it receives,
not the model's context.
Narrow the unit test's name and header comment to what jsdom establishes
(one <ol>, no expand control); jsdom does not resolve CSS Modules layout,
so the scroll geometry belongs to an assembled browser case.
2026-08-03 16:35:37 +08:00
c5050f018e
fix(web): keep ineligible message forks disabled
2026-08-03 16:19:49 +08:00
c43eaaec82
Merge remote-tracking branch 'origin/master' into codex/pr-1150-disabled
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
2026-08-03 16:02:33 +08:00
57219ab060
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 15:41:09 +08:00
a2ec6cefc2
fix(client-web): scroll the web_search source card instead of collapsing
...
Replace the WebBlock search card's head/tail collapse and expand button
with a fixed-height scroll container that lists every source the tool
returned. The model-facing side is unchanged: the seam still caps sources
at searchMaxResults and the truncated indicator stays, so model-visible
and frontend-visible sources remain identical.
Remove CHAT_WEB_MAX_SOURCES and DEFAULT_WEB_MAX_SOURCES: with scroll, the
chat row and details panel show the same full list.
2026-08-03 15:38:26 +08:00
b6b642fae4
Merge branch 'master' into agent/web-bash-error-expand
2026-08-03 02:30:36 -04:00
0a4ad25ce7
fix(web): expand aborted Bash rows
2026-08-02 23:06:00 -07:00
5534431d42
fix(ui-trajectory): own composer overlay geometry
2026-08-03 14:02:40 +08:00
038b6063ee
Merge remote-tracking branch 'origin/master' into codex/pr-1150-conflict-fix
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-08-03 11:34:26 +08:00
8f77ab467f
test(web): harden live thinking tail observation
2026-08-02 06:12:13 -07:00
975b57b54a
feat(web): follow live reasoning tail while collapsed
2026-08-02 05:29:25 -07:00
4329b93989
Merge remote-tracking branch 'origin/master' into codex/fork-real-turn-tail
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageIconActions.tsx
2026-08-02 18:14:32 +08:00
7d08e43720
fix(web): address steering review feedback
2026-08-02 17:53:07 +08:00
3a9f78c55e
feat(web): restore actions after steering consumption
2026-08-02 17:53:07 +08:00
dffe955ed2
feat(web): surface and configure composer steering
2026-08-02 17:53:07 +08:00
5b17d3bab5
fix(web): match queue steer icon to design
2026-08-02 17:53:07 +08:00
955a12cca4
feat(web): steer queued messages into active turns
2026-08-02 17:53:07 +08:00
6e3f77da60
Merge remote-tracking branch 'origin/master' into codex/fork-real-turn-tail
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-08-02 16:25:38 +08:00
76547dfe0c
fix(web): restrict message forks to completed turn tails
2026-08-02 16:25:02 +08:00
cf70a52dcc
Merge origin/master into codex/todo-goal-queue-layout
2026-08-02 14:34:13 +08:00
6332b5b952
fix(web): align context cards on narrow screens
2026-08-02 13:26:08 +08:00
b94d2f9c1d
fix(web): stabilize nested subagent navigation
2026-08-02 12:51:11 +08:00
ca1d838afc
style(web): refine subagent navigation chrome
2026-08-02 12:51:11 +08:00
42d34473af
fix(web): allow follow-ups to running subagents
2026-08-02 12:51:11 +08:00
130410bb98
fix(web): preserve subagent navigation and fork grouping
2026-08-02 12:51:11 +08:00
5d56019d22
feat: revert crumbs navigation for subagents
2026-08-02 12:51:11 +08:00
5ef5feb01a
fix(web): reconcile rebased subagent contracts
2026-08-02 12:51:09 +08:00
5113b831e8
test(client): align card fixtures with subagent session state
2026-08-02 12:51:09 +08:00
8a518e353b
feat(web): rewrite subagent conversations for FIFO activation
2026-08-02 12:51:09 +08:00
16ffd63115
feat(web): add nested subagent conversations
2026-08-02 12:51:09 +08:00
cd121c636a
fix(web): align composer context stack
2026-08-02 12:45:36 +08:00
5e1c4b2b7b
Merge remote-tracking branch 'origin/master' into codex/remove-scoped-bash
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 22:41:07 +08:00
9a3bdd599c
Merge pull request #1099 from deepseek-harness/codex/hide-session-lineage-header
...
fix(web): hide session lineage in header
2026-07-31 21:51:56 +08:00
7b826bf16c
Merge remote-tracking branch 'origin/master' into codex/remove-scoped-bash
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 21:32:02 +08:00
6879c0c9ca
Merge remote-tracking branch 'origin/master' into codex/hide-session-lineage-header
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-31 21:31:04 +08:00
32972f1675
Merge remote-tracking branch 'origin/master' into codex/web-stop-preserve-queue
2026-07-31 21:30:19 +08:00
07b0efc49e
fix(web): hide session lineage in header
2026-07-31 21:08:57 +08:00
32a0e871b7
fix(web): preserve queue on stop
2026-07-31 20:51:05 +08:00
ddda8be736
docs: record scoped bash translation pairs
2026-07-31 20:48:52 +08:00
575e1217bb
fix: remove scoped bash
2026-07-31 20:47:55 +08:00
5e68d812d1
fix(web): let context injection cards fit content
2026-07-31 05:20:54 -07:00
410a837e02
Merge remote-tracking branch 'origin/master' into fix/remove-badge
2026-07-31 19:33:01 +08:00
57d6d9ee1c
fix: ci
2026-07-31 19:20:23 +08:00
1766461947
Merge remote-tracking branch 'origin/master' into fix/remove-badge
2026-07-31 19:13:22 +08:00
f9dc4aa702
feat: remove "插话" badge displayed in user message
2026-07-31 19:12:16 +08:00
4f13ce7b7f
Merge branch 'master' into fix/web-turn-error-surface
2026-07-31 07:07:05 -04:00
404c58717a
Merge remote-tracking branch 'origin/worktree/hero-blank-session-settling' into worktree/hero-blank-session-settling
2026-07-31 18:43:37 +08:00
Chinesezjc