imccyu
3770d947cf
docs(web): correct welcome acknowledgement contract
2026-08-03 18:43:18 +08:00
imccyu
33b52502f4
Merge branch 'master' into agent/fix-remote-welcome-onboarding
2026-08-03 18:37:37 +08:00
imccyu
fc5ee9f786
refactor(client): expose loopback state through connection
2026-08-03 18:35:26 +08:00
imccyu
49ede3ebf3
Merge pull request #1333 from deepseek-harness/codex/fix-subagent-catalog-padding
...
fix(web): align subagent catalog spacing with Figma
2026-08-03 18:34:24 +08:00
kingwl
6585847144
fix(web): preserve subagent catalog styling
2026-08-03 18:24:25 +08:00
imccyu
e47ad8e393
Merge remote-tracking branch 'origin/master' into agent/fix-remote-welcome-onboarding
2026-08-03 18:19:24 +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
kingwl
70ad82ef00
Merge remote-tracking branch 'origin/master' into codex/fix-subagent-catalog-padding
2026-08-03 18:08:15 +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
kingwl
5baa86b97f
fix(web): align subagent catalog spacing
2026-08-03 17:22:51 +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
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
Ziya
aaa2102246
Merge branch 'master' into agent/fix-remote-welcome-onboarding
2026-08-03 04:49:00 -04: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
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
_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
_Kerman
9c261516ce
fix(ui-trajectory): preserve thinking label
2026-08-03 16:22:03 +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
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
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
_Kerman
7bb9b85543
Merge branch 'master' into xtr/trajectory-marker-tooltip-fixes
2026-08-03 15:32:49 +08:00
_Kerman
0e05bb81a3
fix(ui-trajectory): offset recovered request boundaries
2026-08-03 15:31:36 +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
ZiyaZhang
59d923395a
fix(web): document remote welcome constraints
2026-08-03 00:14:35 -07:00
_Kerman
ad6858b6d3
fix(ui-trajectory): limit role tooltips to compact icons
2026-08-03 15:02:05 +08:00
_Kerman
a533cb6ce4
fix(ui-trajectory): distinguish overlapping request markers
2026-08-03 15:01:35 +08:00
Turtle
ef7637a5d8
Merge pull request #1093 from deepseek-harness/fix/tui-terminal-restore-on-boot-failure
...
fix(app-boot): restore the terminal when boot fails
2026-08-03 14:48:20 +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
Turtle
f503c92aff
Merge branch 'master' into fix/tui-terminal-restore-on-boot-failure
2026-08-03 14:40:58 +08:00
Ziya
b6b642fae4
Merge branch 'master' into agent/web-bash-error-expand
2026-08-03 02:30:36 -04:00
imccyu
8527ce23ae
Merge pull request #1169 from deepseek-harness/worktree/directory-picker-path-editor
...
fix(directory-picker-browse): advertise the path editor and walk the panes with the draft
2026-08-03 14:30:34 +08:00
Turtle
ad4aeacd19
fix(hmr,include): settle a failing boot instead of a silent exit 13
...
Master's transactional loader made the invalid-provider PTY case regress:
the HMR main watcher's initial scan refreshed the include mid-initial-apply,
the concurrent group updates stranded the include fiber, and once serialized
the failing apply's rollback deadlocked on HMR's refresh drain — dsh exited
13 with no diagnostic and the terminal stranded, the exact symptom this
branch fixes. Serialize every include child-tree mutation through one queue
and pass ignoreInitial to the HMR main watcher; the failing boot now settles
through boot()'s labelled rejection with the tree disposed and exit 1. The
PTY case asserts the settled diagnostic; the fail-loud release remains the
guard for rejections boot cannot see.
2026-08-03 14:14:20 +08:00
Turtle
b37c22bd0a
Merge origin/master: combine boot-owned settlement with the fail-loud release
...
Conflicts: apps/cli/src/tui.ts (keep the release install over master's comment
rewording), packages/ui/app-boot/README* (master's new installFailLoud row
wording plus this branch's release and timeout rows).
2026-08-03 14:10:23 +08:00
