Chinesezjc
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
imccyu
7f7c86c512
Merge pull request #1174 from deepseek-harness/xtr/trajectory-marker-tooltip-fixes
...
Fix trajectory request markers and disclosure affordances
2026-08-03 18:17:06 +08:00
Yichen Jiang
a31faf24a1
Merge pull request #927 from deepseek-harness/worktree/fix-multi-select-custom-answer
...
fix(user-interaction): preserve selected options with custom answers
2026-08-03 18:15:00 +08:00
imccyu
ae5ee37591
Merge remote-tracking branch 'origin/master' into mergebot/pr927-r3
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/src/components/dialogs.ts
2026-08-03 17:57:50 +08:00
imccyu
4f68543a29
Merge pull request #965 from deepseek-harness/fix/session-waiting-approval
...
fix(ui-workspace): distinguish approval-waiting sessions
2026-08-03 17:51:09 +08:00
ZiyaZhang
5884a44e6b
docs(ui): clarify approval wait ownership
2026-08-03 02:43:27 -07:00
Turtle
adabeb4e18
Merge pull request #594 from deepseek-harness/fix/tui-question-dialog-wrap
...
feat(tui): render QuestionDialog options across multiple lines with scroll markers
2026-08-03 17:31:21 +08:00
imccyu
6b79907ffd
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
2026-08-03 17:19:53 +08:00
Turtle
3b58ed65b7
feat(tui): wrap and page question dialogs
2026-08-03 17:19:40 +08:00
imccyu
553fb9a119
fix: test
2026-08-03 17:17:41 +08:00
Ziya
5d9a4d80e4
Merge branch 'master' into fix/session-waiting-approval
2026-08-03 05:16:42 -04:00
Turtle
ca9bf213b7
Merge pull request #1037 from deepseek-harness/codex/fix-tui-diff-context-counts
...
Fix TUI diff context line accounting
2026-08-03 17:16:15 +08:00
Chinesezjc
e5351d3923
test(web): refresh the Markdown image golden for disabled non-tail forks
...
PR #1003 re-recorded this golden from a base that predated PR #1150 , which
disables the branch control on any message that is not a completed turn's
tail. Both landed on master, whose CI skips the snapshot lane, so the
conflict only surfaces on PRs. The first message's control is now disabled
with its explanatory text.
2026-08-03 17:13:14 +08:00
imccyu
e3ecbf9c0f
Merge remote-tracking branch 'origin/fix/session-waiting-approval' into mergebot/pr965
2026-08-03 17:12:08 +08:00
imccyu
a3d897359f
test(web): refresh Markdown image golden for the fork-eligibility gate
2026-08-03 17:11:36 +08:00
Chinesezjc
2bbaafb552
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 17:09:12 +08:00
imccyu
a8670bdec3
Merge remote-tracking branch 'origin/master' into mergebot/pr965
2026-08-03 17:04:00 +08:00
imccyu
987a835803
Merge branch 'master' into fix/session-waiting-approval
2026-08-03 17:03:02 +08:00
imccyu
58b4514bad
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 17:02:55 +08:00
Tianyi Cui
731f16ceb0
Merge pull request #1179 from deepseek-harness/worktree/production-issue-management
...
chore: add Issue management runtime
2026-08-03 17:01:37 +08:00
Turtle
4c8b47f3c6
test(web): refresh markdown image golden
2026-08-03 17:00:33 +08:00
imccyu
070f371370
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:55:48 +08:00
imccyu
d1dbff66e0
Merge remote-tracking branch 'origin/master' into fix/session-waiting-approval
2026-08-03 16:51:18 +08:00
Turtle
2c78041878
Merge remote-tracking branch 'origin/master' into codex/pr-1037-resolution
...
# Conflicts:
# docs/config-catalog.md
# packages/ui/tui/README.i18n.yaml
2026-08-03 16:49:58 +08:00
Turtle
4edb828364
Merge remote-tracking branch 'origin/master' into codex/pr-1037-resolution
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-08-03 16:49:18 +08:00
Chinesezjc
1d3a807e49
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 16:48:14 +08:00
Chinesezjc
a0b4b65ab8
test(web): pin the source list's scroll geometry in the assembled browser
...
jsdom resolves no CSS Modules layout and reports scrollHeight === clientHeight
for every element, so the unit test cannot witness the scroll the .sources
max-height produces. Drive it in the real browser instead.
The web-search-round search double now returns 12 provider results with a
title, snippet, and date each. That pins the seam's cap end to end for the
first time in a real composition — searchMaxResults keeps 8, the model-visible
text carries the kept titles and none of the dropped URLs, meta.truncated is
true — and 8 such rows overflow the 320px container. A case after the aria
golden expands the row and asserts 8 <li>, no button, the truncation
indicator, and computed max-height/overflow-y with scrollHeight > clientHeight.
The recorded stream and the aria golden are unchanged: replay is a positional
cursor over the fixture's chunks and the search double is a separate local
endpoint, while the card is collapsed at capture time.
2026-08-03 16:46:05 +08:00
Yichen Jiang
3009bc5312
Merge pull request #1003 from deepseek-harness/worktree/web-remote-markdown-images
...
feat(web): render remote Markdown images
2026-08-03 16:41:00 +08:00
Chinesezjc
19f2c45bb0
Merge remote-tracking branch 'origin/master' into fix/web-sources-scroll
2026-08-03 16:38:12 +08:00
Tianyi Cui
f3fd8e4cd3
chore: add Issue management runtime
2026-08-03 16:38:11 +08:00
Chinesezjc
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
imccyu
4fd3ef5797
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:30:35 +08:00
imccyu
8daca45712
Merge pull request #1150 from deepseek-harness/codex/fork-real-turn-tail
...
fix(web): restrict message forks to completed turn tails
2026-08-03 16:30:23 +08:00
Yichen Jiang
ebe5bcea29
Merge remote-tracking branch 'origin/worktree/fix-multi-select-custom-answer' into worktree/fix-multi-select-custom-answer
2026-08-03 16:28:08 +08:00
Yichen Jiang
85b9914934
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-08-03 16:26:55 +08:00
imccyu
0f2ecd39df
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:26:00 +08:00
_Kerman
b5f9fcdea4
fix(ui-trajectory): clarify assistant request timing
2026-08-03 16:24:26 +08:00
imccyu
fec8339a18
Merge branch 'master' into worktree/web-remote-markdown-images
2026-08-03 16:23:50 +08:00
imccyu
a8a97d0202
Merge branch 'master' into codex/fork-real-turn-tail
2026-08-03 16:23:46 +08:00
Turtle
124bef3889
Merge pull request #1067 from deepseek-harness/pr/tui-details-fold
...
feat(tui): hidden-mode assistant fold and /details command
2026-08-03 16:23:13 +08:00
_Kerman
9c261516ce
fix(ui-trajectory): preserve thinking label
2026-08-03 16:22:03 +08:00
Yichen Jiang
886c39d302
test(web): refresh Markdown image snapshot
2026-08-03 16:21:02 +08:00
kingwl
c5050f018e
fix(web): keep ineligible message forks disabled
2026-08-03 16:19:49 +08:00
_Kerman
c2b0cc7b51
fix(ui-trajectory): clarify collapsed thinking controls
2026-08-03 16:19:41 +08:00
Yichen Jiang
61cba0cda2
Merge remote-tracking branch 'origin/master' into worktree/web-remote-markdown-images
...
# Conflicts:
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/README.md
# packages/client/ui-primitives/README.zh.md
# packages/client/ui-primitives/src/markdown/MarkdownText.tsx
# packages/client/ui-primitives/tests/markdown.spec.tsx
2026-08-03 16:09:51 +08:00
Yichen Jiang
109d5b5e1c
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
...
# Conflicts:
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/question-composer/session.jsonl
# docs/core-data-structures/user-interaction.i18n.yaml
# packages/client/ui-question/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/ui/tui/README.i18n.yaml
# packages/ui/user-interaction/README.i18n.yaml
2026-08-03 16:09:17 +08:00
Turtle
2178c66b0d
test(tui): refresh queued compaction help snapshot
2026-08-03 16:06:51 +08:00
kingwl
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
Turtle
4fa1d48bf9
Merge remote-tracking branch 'origin/master' into pr/tui-details-fold
2026-08-03 15:56:02 +08:00
Turtle
bea60a430e
Merge remote-tracking branch 'origin/master' into pr/tui-details-fold
...
# Conflicts:
# docs/cordis-catalog/services.md
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/README.md
# packages/ui/tui/README.zh.md
# packages/ui/tui/src/index.ts
2026-08-03 15:55:22 +08:00
