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
ZiyaZhang
5884a44e6b
docs(ui): clarify approval wait ownership
2026-08-03 02:43:27 -07:00
imccyu
6b79907ffd
Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer
2026-08-03 17:19:53 +08:00
Ziya
5d9a4d80e4
Merge branch 'master' into fix/session-waiting-approval
2026-08-03 05:16:42 -04:00
imccyu
a8670bdec3
Merge remote-tracking branch 'origin/master' into mergebot/pr965
2026-08-03 17:04:00 +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
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
imccyu
4fd3ef5797
Merge branch 'master' into worktree/fix-multi-select-custom-answer
2026-08-03 16:30:35 +08:00
kingwl
c5050f018e
fix(web): keep ineligible message forks disabled
2026-08-03 16:19:49 +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
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
Wenlu Wang
6a3caea277
Merge pull request #1160 from deepseek-harness/codex/subagent-token-metrics
...
Show subagent token metrics
2026-08-03 15:35:17 +08:00
imccyu
2d31ec5fee
Merge pull request #1173 from deepseek-harness/agent/web-bash-error-expand
...
fix(web): expand aborted Bash rows
2026-08-03 15:30:52 +08:00
kingwl
d5583210d4
tighten branchless subagent catalog layout
2026-08-03 15:19:53 +08:00
Wenlu Wang
8e820bbbf5
Merge pull request #1159 from deepseek-harness/codex/subagent-token-duration
...
Fix subagent active duration tracking
2026-08-03 14:45:29 +08:00
Ziya
b6b642fae4
Merge branch 'master' into agent/web-bash-error-expand
2026-08-03 02:30:36 -04:00
ZiyaZhang
0a4ad25ce7
fix(web): expand aborted Bash rows
2026-08-02 23:06:00 -07:00
_Kerman
5b17413108
docs(ui-trajectory): record composer overlay contract
2026-08-03 14:02:54 +08:00
_Kerman
5534431d42
fix(ui-trajectory): own composer overlay geometry
2026-08-03 14:02:40 +08:00
Yif
062a1507f1
feat(ui-trajectory): float the composer over the ledger like chat
...
The trajectory host kept the composer as a fixed flex sibling, so the
ledger never reached the viewport bottom. Anchor the composer seat
absolutely over the ledger (reusing chat's fade treatment) and have the
internal scroll panes reserve the composer's live height plus a 16px gap
so end rows and detail bodies scroll clear of the overlay.
(cherry picked from commit 0058a1f4b6e8c2e23bfde7c827a84838cc5ebffc)
2026-08-03 13:55:33 +08:00
_Kerman
44304a458c
fix(ui-trajectory): separate consecutive request markers
2026-08-03 13:53:50 +08:00
_Kerman
68e79ed983
docs(ui-trajectory): record timeline interaction contract
2026-08-03 13:48:11 +08:00
_Kerman
74cd2e4bd9
feat(ui-trajectory): enrich timeline timing interactions
2026-08-03 13:48:03 +08:00
_Kerman
c8ece8325c
fix(ui-trajectory): follow live ledger tail
2026-08-03 13:47:55 +08:00
_Kerman
a8478fc031
fix(ui-trajectory): animate responsive ledger layout
2026-08-03 13:47:51 +08:00
_Kerman
94dabcb7ed
feat(ui-primitives): support delayed multiline tooltips
2026-08-03 13:47:37 +08:00
kingwl
583d532bc3
merge compact duration display
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.md
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.zh.md
# apps/web/tests/snapshots/subagent-conversation/tree.expected.md
# packages/client/ui-subagent/README.i18n.yaml
# packages/client/ui-subagent/README.md
# packages/client/ui-subagent/README.zh.md
# packages/client/ui-subagent/src/client/SubagentCatalogAction.tsx
# packages/client/ui-subagent/tests/conversation-ui.spec.tsx
2026-08-03 13:31:19 +08:00
kingwl
255cd90c6e
compact long subagent durations
2026-08-03 13:23:40 +08:00
kingwl
24ff409f62
merge refreshed duration base
2026-08-03 12:03:59 +08:00
kingwl
ad42057586
merge latest master into subagent duration fix
2026-08-03 12:02:47 +08:00
kingwl
e97b47092e
merge subagent timing review fixes
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.md
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.zh.md
# packages/client/ui-subagent/README.i18n.yaml
# packages/client/ui-subagent/README.md
# packages/client/ui-subagent/README.zh.md
2026-08-03 11:51:24 +08:00
kingwl
fdf83f2c3e
document projection-cut duration bound
2026-08-03 11:44:11 +08:00
kingwl
0b0de64769
bound inactive subagent timing to projection cut
2026-08-03 11:40:33 +08:00
kingwl
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
creatixchu
3f34a72b66
review(ui-primitives): stop the size doc from enumerating native sizes
...
The parenthetical listed 14/16 and this branch added 20, but the set never
held to it: IconRightUpOutline14 defaults to 8, IconTreeCorner8x10 to 10,
and IconWarningOutline16 to 14. Drop the list rather than maintain one that
drifts, and retitle the icons test that carried the same generalization.
2026-08-03 10:42:34 +08:00
creatixchu
b85c0a1851
fix(ui-workspace): draw Archive session with the archive-box glyph
...
The session row menu's Archive action carried ic_ds_download_outline_16, a
download tray that reads as "save to disk" rather than "put away". Swap it
for the design's archive glyph — a lidded box with a label slot — added to
the ic_ds_* set as IconArchiveOutline20.
The glyph is native 20, the first of that size in the set, so the menu's
16px icon slot asks for it explicitly. The figma export's 0.11px stroke ring
around the box contour is dropped: it restates the same contour in the same
ink, which currentColor already carries.
2026-08-03 10:30:32 +08:00
kingwl
57e2433f45
show subagent token metrics
2026-08-03 01:19:36 +08:00
kingwl
c831c99981
keep subagent duration fix focused
2026-08-03 01:08:32 +08:00
kingwl
3a920be9c5
stack subagent token and duration metrics
2026-08-03 00:22:01 +08:00
kingwl
6b6acbe0c5
Merge master into subagent usage branch
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.md
# .agents/notes/implemented/feature/2026-07-27-web-subagent-conversations.zh.md
# apps/web/tests/snapshots/subagent-conversation/tree.expected.md
# apps/web/tests/subagent-conversation.e2e.ts
# packages/client/ui-subagent/src/client/SubagentCatalogAction.tsx
2026-08-02 23:37:17 +08:00
kingwl
b30686d634
show subagent usage and active duration
2026-08-02 23:31:24 +08:00
Tianyi Cui
1ea72962eb
Merge master into fix/subagent-stack-end-result
2026-08-02 23:13:00 +08:00
Tianyi Cui
711a33ea8d
fix(web): keep known subagent chooser visible
2026-08-02 21:22:39 +08:00
ZiyaZhang
8f77ab467f
test(web): harden live thinking tail observation
2026-08-02 06:12:13 -07:00
ZiyaZhang
975b57b54a
feat(web): follow live reasoning tail while collapsed
2026-08-02 05:29:25 -07:00
Tianyi Cui
e4663cb10b
test(web): share the subagent locale translator
...
The localized catalog spec introduced two package-local translation stubs: one manually looped over interpolation parameters and the other indexed the Chinese dictionary directly. That duplicates framework test plumbing and can drift from the shared lookup, fallback, and placeholder semantics used by the rest of the client suites.
Use makeTranslate from dsh-client-test-runtime as the single Chinese translator for both catalog and read-only composer assertions. Record the test-only workspace dependency in the ui-subagent manifest and lockfile; no production dependency or runtime bundle edge is added.
This removes twelve lines of local translation behavior while preserving the same Chinese assertions and exercising the shared interpolation path. Both ui-subagent test files pass with all 28 tests, the package TypeScript project checks cleanly, and the staged diff passes formatting, lint, and whitespace hooks.
2026-08-02 20:28:23 +08:00
