Chinesezjc
c14948c531
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
2026-07-30 23:48:57 +08:00
Chinesezjc
91244321af
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 23:19:36 +08:00
Tianyi Cui
38a7c823d7
Merge branch 'master' into feature/directory-listing-tool
2026-07-30 23:17:12 +08:00
imccyu
da9f02221e
Merge remote-tracking branch 'origin/master' into worktree-forkweb
2026-07-30 22:53:07 +08:00
Chinesezjc
425e59119a
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 22:46:27 +08:00
Tianyi Cui
16a287d726
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:41:07 +08:00
Chinesezjc
03d1e6855a
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
2026-07-30 22:24:51 +08:00
Tianyi Cui
dc5f270ae2
Merge branch 'master' into codex/queue-collapse
2026-07-30 22:18:44 +08:00
Tianyi Cui
b5f5a01dcb
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:14:08 +08:00
imccyu
f2bbc0f453
Merge branch 'master' into worktree-forkweb
2026-07-30 22:12:50 +08:00
Chinesezjc
568c564db4
fix(web): update diff-card tests for the openFile no-double-resolve contract
...
The coverage lane caught a regression in the prior commit: FileMutationRow now
passes the tool's raw path to the injected openFile (which resolves against cwd
in apply.ts), but diff-card.spec still asserted the row pre-resolved. Assert on
the raw path instead. Also fix the built-boot diff assertion to match on the
line body and footer text — the `+ ` prefix is a CSS ::before, absent from
textContent.
2026-07-30 21:51:27 +08:00
Chinesezjc
1fd6b5a107
fix(web): diff card review — TUI parity, path-header overlap, double-resolve
...
Bring the TUI diff footer onto the same terminator rule and distinct-path
count the Web DiffBlock uses (a trailing newline terminates its line; two
hunks in one file read as 1 file), so the two front ends' `+A -R · N file(s)`
footers agree. Reserve space in the diff path header for the floating copy
button so a long path no longer scrolls under it. Pass the tool's raw path to
the injected openFile (which already resolves against cwd) instead of resolving
twice. Rename the shared block-body CSS class to a card-neutral cardBody so a
terminal-spacing tweak cannot silently move the diff card. Add a same-file
two-hunk TUI unit test and an assembled built-boot assertion that the write
turn renders +1 -0 · 1 file end to end.
2026-07-30 21:36:42 +08:00
imccyu
3b370549a1
feat(client): increment forked session titles
2026-07-30 21:28:17 +08:00
imccyu
213de9a737
feat(ui-conversation): wire assistant session forks
2026-07-30 21:28:17 +08:00
imccyu
7d27c92851
test(web): cover row fork in the real app
2026-07-30 21:28:16 +08:00
imccyu
36f1489398
fix(web): address session fork review findings
2026-07-30 21:28:13 +08:00
Tianyi Cui
6777e4fab9
fix(fs-search): make glob sampling an explicit choice
2026-07-30 21:14:03 +08:00
kingwl
29d8ca5ee5
Merge remote-tracking branch 'origin/master' into codex/queue-collapse
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 20:11:46 +08:00
creatixchu
692ada7485
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 19:48:45 +08:00
imccyu
a1f1f9c29a
Merge branch 'master' into codex/figma-context-injection-row
2026-07-30 19:20:21 +08:00
kingwl
dec8173c43
Merge remote-tracking branch 'origin/master' into codex/queue-collapse
2026-07-30 19:20:20 +08:00
kingwl
5f87c7a89c
fix(web): close queue collapse review gaps
2026-07-30 19:20:13 +08:00
creatixchu
5e4922a761
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
...
# Conflicts:
# apps/cli/cordis.yml
# packages/host/README.i18n.yaml
2026-07-30 18:41:41 +08:00
creatixchu
33bb266932
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 18:29:37 +08:00
kingwl
cdd1074805
Merge remote-tracking branch 'origin/master' into codex/queue-collapse
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 18:21:07 +08:00
Tianyi Cui
66e182b516
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:35:47 +08:00
kingwl
0f0564b3d0
Merge origin/master into codex/figma-context-injection-row
2026-07-30 17:35:04 +08:00
creatixchu
eba513340c
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:34:59 +08:00
kingwl
f5228e7c71
Merge origin/master into codex/figma-context-injection-row
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
2026-07-30 17:34:14 +08:00
creatixchu
295813f6eb
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:32:46 +08:00
creatixchu
8cf1603d56
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:18:43 +08:00
creatixchu
b8d9fb1ede
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:17:03 +08:00
imccyu
4cd5745b94
Merge branch 'master' into codex/details-default-closed
2026-07-30 17:14:51 +08:00
creatixchu
85a2789833
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:10:36 +08:00
Tianyi Cui
abd7d57358
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:08:42 +08:00
creatixchu
3809795fd5
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:02:33 +08:00
imccyu
34d5f8f2e2
Merge branch 'master' into feat/ask-question-gui
2026-07-30 16:55:54 +08:00
imccyu
f87692a5c3
test(web): anchor the group section above the HoverCard wrapper
...
The workspace header row is now wrapped by its HoverCard anchor span
(0b4a6196f), so the row's immediate parent no longer holds the session
subtree; the delete scenario anchors on the groupSection ancestor
instead. The flat-view and dwell failures were downstream of this one
(shared page state).
2026-07-30 16:54:43 +08:00
Turtle
3c620a0cb6
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# docs/cordis-catalog/services.md
# packages/host/apiproxy/README.i18n.yaml
2026-07-30 16:53:55 +08:00
imccyu
34c124585a
fix: test
2026-07-30 16:46:50 +08:00
kingwl
0a25c0d237
feat(web): add queue collapse control
2026-07-30 16:41:55 +08:00
kingwl
d7641ec028
Merge origin/master into codex/figma-context-injection-row
2026-07-30 16:20:47 +08:00
kingwl
17893c503e
feat(web): match context injection disclosure design
2026-07-30 16:20:34 +08:00
creatixchu
bfbab9d2ab
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-28-directory-picker-capability-seam.i18n.yaml
2026-07-30 16:20:22 +08:00
imccyu
d34bc5bfa4
test(web): pick up the plan chip in the answered composer golden
...
The always-visible plan-mode toggle (fe9191934) adds one composer-row
button; the answered transcript golden re-records with it.
2026-07-30 15:44:53 +08:00
imccyu
17fea637d5
Merge branch 'master' into codex/details-default-closed
2026-07-30 15:40:36 +08:00
imccyu
e184b9561a
Merge branch 'master' into feat/ask-question-gui
2026-07-30 15:36:22 +08:00
Hypatia May
30667e1eb9
Merge remote-tracking branch 'origin/master' into feat/session-inherited-boundary
2026-07-30 15:34:55 +08:00
Hypatia May
9d26815126
test(web): wait for the driven session before snapshotting
2026-07-30 15:32:17 +08:00
creatixchu
4795904c70
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 15:30:39 +08:00
