_Kerman
694f9009ec
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-23-web-permission-and-approval.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
2026-08-04 21:04:43 +08:00
_Kerman
e50c4aca03
refactor(agent-loop): start waking work directly
2026-08-04 21:02:28 +08:00
Turtle
e2049910d5
refactor(client): keep pending interaction change UI-scoped
2026-08-04 20:28:23 +08:00
_Kerman
674278cb17
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/client/ui-conversation/src/client/queue/QueueDock.tsx
2026-08-04 19:37:51 +08:00
Turtle
76d43d616d
Merge remote-tracking branch 'origin/master' into codex/session-pending-interactions
...
# Conflicts:
# packages/client/connection/README.i18n.yaml
# packages/client/connection/README.md
# packages/client/connection/README.zh.md
2026-08-04 19:03:01 +08:00
Turtle
3a54694d28
fix(client): preserve pending waits across reconnect
2026-08-04 18:52:11 +08:00
Turtle
00d4349eb4
feat(client): surface pending session interactions
2026-08-04 17:15:10 +08:00
_Kerman
09e909b96b
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# apps/web/tests/snapshots/queue-actions/preserved.expected.md
# packages/client/runtime/src/client/sessions/session.ts
2026-08-04 16:56:44 +08:00
imccyu
72f82f65c9
Merge remote-tracking branch 'origin/master' into mergebot/pr1389
...
# Conflicts:
# apps/web/tests/snapshots/sidebar-scrollbar/geometry.expected.md
# packages/client/ui-conversation/src/client/chat/MessageIconActions.tsx
# packages/client/ui-conversation/src/client/chat/message-chrome.ts
2026-08-04 16:33:55 +08:00
creatixchu
29646074cd
Merge origin/master into worktree/sidebar-scrollbar-reveal
2026-08-04 16:19:46 +08:00
imccyu
b9f4e46462
Merge remote-tracking branch 'origin/master' into mergebot/pr1389
...
# Conflicts:
# packages/client/ui-workspace/src/client/WorkspaceBrowser.module.css
2026-08-04 16:06:38 +08:00
imccyu
ad03ccbd7a
Merge branch 'master' into feat/turn-running-time
2026-08-04 16:03:31 +08:00
imccyu
cc435a9c0c
fix(web): use exact turn boundaries for run time
2026-08-04 15:55:07 +08:00
_Kerman
d5527da905
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.md
# .agents/notes/implemented/feature/2026-07-28-web-terminal-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-search-render-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-search-render-card.md
# .agents/notes/implemented/feature/2026-07-30-search-render-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-web-read-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-web-read-card.md
# .agents/notes/implemented/feature/2026-07-30-web-read-card.zh.md
# .agents/notes/implemented/feature/2026-07-30-web-result-card.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-web-result-card.md
# .agents/notes/implemented/feature/2026-07-30-web-result-card.zh.md
2026-08-04 15:49:07 +08:00
creatixchu
86514f2921
Merge origin/master into worktree/sidebar-scrollbar-reveal
...
#1381 landed the bar's horizontal position; this branch decides when it is
drawn. The e2e keeps both scenarios and the golden carries both palettes'
pointer-state readings alongside the new edge-offset lines.
2026-08-04 15:46:53 +08:00
creatixchu
10ce8d8a45
fix(web): decide the sidebar's pointer leave by geometry, and tighten the gate
...
Review findings from the first round:
- ui-settings renders its full-viewport panel as a fixed-position DESCENDANT
of the sidebar column, so `pointerleave` never fires when the pointer moves
onto it and the bars stayed drawn after it closed. Leaving is now decided
against the column's box from a document-level pointermove that exists only
while the bars are drawn; the element's own leave stays for the pointer that
leaves the window.
- The rebind gate judges the rule rather than each declaration, so a pair that
mixes `transparent` with an l2 hover no longer passes, and the elevation
half compares whole values instead of token shape.
- Hiding no longer exempts a sheet from the elevated-surface rebind check.
- The e2e polls the reveal before reading a colour for the golden, and pins
that a pointerless scroll draws no thumb.
2026-08-04 15:42:39 +08:00
fz
eaf5b879c6
fix(docs): remove stale TUI source references
2026-08-04 15:25:30 +08:00
imccyu
2a828f09da
Merge remote-tracking branch 'origin/master' into feat/turn-running-time
2026-08-04 15:22:28 +08:00
fz
193d918856
Merge remote-tracking branch 'origin/master' into codex/fix-headless-sigint
...
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# apps/cli/config/base.cordis.yml
2026-08-04 15:18:48 +08:00
creatixchu
a030397aca
feat(web): draw the sidebar's scrollbar only under the pointer
...
The session list overflows after a handful of sessions, and its scrollbar
was drawn permanently in a column that is at rest most of the time.
SidebarRoot now tracks the pointer over the whole column and rebinds
ui-theme's scrollbar indirection pair to `transparent` while it is
outside, keeping the thumb for 2s after the pointer leaves so it does not
blink out on the way past. Rebinding colour leaves the list's
`scrollbar-gutter: stable` reservation in force, so revealing the bar
moves no row.
ui-theme's gate now states the widened contract: a rebind targets an -l2
token pair or `transparent`, and nothing else.
2026-08-04 15:05:32 +08:00
_Kerman
9b50311fd1
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
2026-08-04 14:46:18 +08:00
_Kerman
c75c966a25
docs: remove stale TUI card references
2026-08-04 14:29:34 +08:00
kingwl
6514a59d5d
fix(ui-conversation): preserve semantic chat scroll position
2026-08-04 14:23:34 +08:00
_Kerman
5356bd972d
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/archived/feature/2026-07-28-dsh-guided-skill-session-commands.i18n.yaml
# .agents/notes/archived/manifest.json
# .agents/notes/implemented/bug-fix/2026-07-29-human-transcript-append-origin.i18n.yaml
# .agents/notes/implemented/feature/2026-07-05-skill-system.i18n.yaml
# apps/cli/tests/snapshots/multi-turn-conversation/terminal.expected.txt
# apps/cli/tests/snapshots/queued-manual-compact/terminal.expected.txt
# apps/cli/tests/tui-keyless-smoke.e2e.ts
# apps/cli/tests/tui.snapshot.ts
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/event-producer-consumer.md
# 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/harness.ts
# packages/ui/tui/tests/session-reference.snapshot.ts
# packages/ui/tui/tests/snapshots/conversation-streaming.expected.txt
# packages/ui/tui/tests/snapshots/details-command.expected.txt
# packages/ui/tui/tests/snapshots/details-selector.expected.txt
# packages/ui/tui/tests/snapshots/disposed-terminal.expected.txt
# packages/ui/tui/tests/snapshots/errors-and-help.expected.txt
# packages/ui/tui/tests/snapshots/status-diagnostics-narrow.expected.txt
# packages/ui/tui/tests/snapshots/status-diagnostics.expected.txt
# packages/ui/tui/tests/snapshots/surface-after-compaction-narrow.expected.txt
# packages/ui/tui/tests/snapshots/surface-after-compaction-wide.expected.txt
# packages/ui/tui/tests/snapshots/surface-before-compaction.expected.txt
# packages/ui/tui/tests/snapshots/surface-replayed-compaction.expected.txt
# packages/ui/tui/tests/snapshots/todo-plan-cleared.expected.txt
# packages/ui/tui/tests/snapshots/tool-cards-hidden-folded.expected.txt
# packages/ui/tui/tests/snapshots/untrusted-controls.expected.txt
# packages/ui/tui/tests/tui.snapshot.ts
# packages/ui/tui/tests/tui.spec.ts
2026-08-04 14:19:23 +08:00
_Kerman
1b16cef582
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# examples/acp-agent/tests/goal-snapshots/goal-session/input.json
# packages/client/ui-conversation/README.i18n.yaml
# packages/session-persistence/session-persistence-jsonl/src/zstd.ts
# packages/support/acp-snapshot/src/harness.ts
2026-08-04 14:14:57 +08:00
Yif
92dd231ce4
polish(web): 打磨 Web 会话界面的布局、自适应与组件一致性
...
1. 统一会话列宽度轴：新增 --dsh-chat-content-width（748px），输入框、todo、goal、queue、approval、plan review、ask question 等容器的宽度与边距全部由该变量推导，消除各面板之间的像素漂移，窄视口下的边缘留白也保持一致。
2. 输入框自适应与细节：控制行改为容器查询（460px 阈值以下权限选择器只显示图标+下拉，隐藏文字）；卡片圆角 20→22、行内边距调整并整体下移 2px（发送按钮除外）；permission/model 触发器统一 24px 圆角；Plan 与 Read Only 间距 +8。
3. 修复浮层菜单溢出：slash 菜单与命令弹层钳制到输入卡片宽度，超长行以省略号截断；Tooltip 增加 12px 视口边缘安全距离。
4. 增加与替换图标：Add provider 改用输入框同款加号图标（IconPlusOutline16），统一图标尺寸与字号。
5. 统一 Settings → Models 组件：补齐按钮 hover 态、select 下拉箭头不再贴边、标题区与 provider 卡片间距 +12。
6. 侧边栏交互：add workspace / group by / create session / 收起侧边栏四个图标按钮增加 500ms 延迟 tooltip（前两个向下弹出）；展开态的 New Session 不再重复显示 tooltip；侧边栏窄屏自适应收起逻辑微调。
7. 其他：hero 区 workspace 徽章右移对齐；附带 Agent Note（中英双语）记录共享宽度轴与容器查询的设计取舍。
2026-08-04 14:14:12 +08:00
Turtle
64f9a83bd6
Merge pull request #1369 from deepseek-harness/codex/remove-dsh-tui-entrypoint
...
cleanup: remove TUI package and legacy dsh entrypoints
2026-08-04 14:11:37 +08:00
_Kerman
e874910a76
test(session): align turn-end contract artifacts
2026-08-04 14:09:52 +08:00
_Kerman
d4fa26023d
fix(agent-loop): open turns before pre-step
2026-08-04 13:49:35 +08:00
Turtle
10bb9cbf4a
cleanup: remove TUI package and legacy dsh entrypoints
2026-08-04 13:20:28 +08:00
Chinesezjc
6601738e32
Merge origin/master into fix/web-sources-scroll
2026-08-04 13:11:40 +08:00
fz
f0e5a39d19
Merge remote-tracking branch 'origin/master' into codex/fix-headless-sigint
2026-08-04 11:07:36 +08:00
_Kerman
98947afece
chore(docs): trim translation sidecar churn
2026-08-04 11:04:03 +08:00
_Kerman
eaa497d735
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-19-package-owned-invariant-service.i18n.yaml
# examples/acp-agent/tests/snapshots/fs-glob-sampling/session.jsonl
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/src/components/dialogs.ts
# packages/ui/tui/tests/tui.spec.ts
2026-08-04 10:52:45 +08:00
fz
ef23b88ad4
fix(cli): bound telemetry shutdown on signals
...
Refs #1356
2026-08-03 22:08:47 +08:00
_Kerman
d4794ed991
Merge branch 'master' into xtr/react-loop-simplification
2026-08-03 21:31:57 +08:00
Huanqi Cao
0ee198d70e
Merge remote-tracking branch 'origin/master' into feat/ripgrep-packaged-binary
2026-08-03 20:19:49 +08:00
Yif
6ec5a6136b
feat(web): show turn run time with hover-revealed time chrome
...
Derive turn wall time from adjacent logged timestamps (no new session
events): the actions-owning assistant footer gains a localized
"Ran for {duration}" label, and the running TurnStatus label gains a
live elapsed clock anchored to the same logged trigger so a mid-turn
reload keeps the real elapsed time. Message time chrome is now
hover-revealed on hover-capable devices, keeping icons visible and
layout stable.
2026-08-03 19:58:58 +08:00
Chinesezjc
e6d6e192d5
fix(ui-primitives): keep two-digit source markers out of the scroll clip
...
Making `.sources` a scroll container turned its `padding-left` from spacing
into a correctness constraint. A scroll container clips inline-start overflow
with no way to scroll it back, and `::marker` is right-aligned to the content
edge, so past nine sources the markers rendered as `0.` and `1.` where `10.`
and `11.` belonged.
`searchMaxResults` is an unbounded positive integer, so size the padding in
`em` against the list's own font to hold a three-digit marker. The browser e2e
measures a `999. ` marker in that inherited font and requires the computed
padding to be at least that wide, pinning the room against the widest marker
rather than one fixture's source count.
2026-08-03 18:58:44 +08:00
_Kerman
8ee811e8d9
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/client/ui-conversation/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
2026-08-03 18:39:58 +08:00
imccyu
fc5ee9f786
refactor(client): expose loopback state through connection
2026-08-03 18:35:26 +08:00
imccyu
e47ad8e393
Merge remote-tracking branch 'origin/master' into agent/fix-remote-welcome-onboarding
2026-08-03 18:19:24 +08:00
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
_Kerman
ce60304648
chore(ci): regenerate stale catalogs and re-record translation pairs
...
- gen-cordis-catalog / gen-persistence-catalog / gen-doc-graphs after the
error-reason and steering/message changes (line anchors and event
producer/consumer graph drifted).
- verify-translation-pairing --write --all: every bilingual pair touched
by the PR (agent notes, session/core docs, READMEs) plus the merge.
- queue-actions preserved golden re-recorded against the rebuilt client
(branch disabled on non-completed-turn tails is back in effect).
2026-08-03 18:06:14 +08:00
_Kerman
6ae82e390e
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-08-03 17:22:27 +08:00
Turtle
3b58ed65b7
feat(tui): wrap and page question dialogs
2026-08-03 17:19:40 +08:00
_Kerman
734c3d1f65
Merge remote-tracking branch 'origin/master' into xtr/react-loop-simplification
...
# Conflicts:
# apps/cli/tests/snapshots/queued-manual-compact/terminal.expected.txt
# apps/web/tests/snapshots/queue-actions/preserved.expected.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/tests/snapshots/untrusted-controls.expected.txt
2026-08-03 17:15:34 +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
