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
Chinesezjc
c425e31c1c
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
2026-07-30 22:59:55 +08:00
Chinesezjc
f9a40d555f
docs: record ui-conversation README pairing hash after master merge
2026-07-30 22:59:34 +08:00
imccyu
da9f02221e
Merge remote-tracking branch 'origin/master' into worktree-forkweb
2026-07-30 22:53:07 +08:00
Tianyi Cui
7e381bf70f
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
2026-07-30 22:47:31 +08:00
Tianyi Cui
6f89c6405d
Merge pull request #1001 from deepseek-harness/worktree-optgate
...
revert CI cocurrency 4/12
2026-07-30 22:46:33 +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
Tianyi Cui
48b0cb25fd
fix(fs-search): respect platform path separators
...
Group paths using node:path.sep so POSIX backslashes remain filename characters while Windows continues to treat them as separators.
2026-07-30 22:26:33 +08:00
Tianyi Cui
72220dd821
fix(fs-search): drop exhausted glob sample groups
...
Keep only groups with another path in the active round. This bounds skewed sampling by paths visited instead of rescanning every singleton for every late-group item.
2026-07-30 22:26:33 +08:00
Chinesezjc
03d1e6855a
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
2026-07-30 22:24:51 +08:00
Chinesezjc
1ea5f0b124
test(tui): cover diffContentLines empty-side arm
...
The coverage lane flagged transcript.ts line 63 (diffContentLines' empty-text
return) uncovered: the same-file diff test only fed newline-terminated sides.
Add a third hunk removing a line with an empty added side (a full deletion), so
the empty arm runs and the footer proves the empty side draws no `+ ` row
(+2 -1 · 1 file). Raise the test's line budget so every hunk row stays visible.
2026-07-30 22:24:29 +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
imccyu
6f2e8fb6aa
Merge branch 'master' into worktree-forkweb
2026-07-30 21:53:03 +08:00
Chinesezjc
de36fde01c
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
2026-07-30 21:51:48 +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
imccyu
e35e2a9f3e
perf: tsc
2026-07-30 21:50:48 +08:00
Wenlu Wang
a1c8fa06a0
Merge branch 'master' into codex/queue-collapse
2026-07-30 21:46:37 +08:00
creatixchu
ddc4adb7a3
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:42:30 +08:00
Tianyi Cui
ec9ff784fa
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:41:25 +08:00
Chinesezjc
46e18cf0d3
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
2026-07-30 21:37:01 +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
Tianyi Cui
99db7e8fc3
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
2026-07-30 21:35:08 +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
2f8f47e500
feat(ui-workspace): flatten session fork rows
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
imccyu
57fb5b488e
feat: fork
2026-07-30 21:27:14 +08:00
creatixchu
8d864c9549
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 21:22:28 +08:00
Tianyi Cui
81e5eb9800
Merge latest master into worktree-config-settings-seam
2026-07-30 21:21:35 +08:00
Tianyi Cui
6777e4fab9
fix(fs-search): make glob sampling an explicit choice
2026-07-30 21:14:03 +08:00
Chinesezjc
7166ad88ca
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
2026-07-30 21:08:52 +08:00
Tianyi Cui
21e8af2b3a
Merge remote-tracking branch 'origin/master' into feature/directory-listing-tool
...
# Conflicts:
# packages/fs/tool-fs-search/README.i18n.yaml
# packages/fs/tool-fs-search/README.zh.md
2026-07-30 20:56:27 +08:00
imccyu
a07f7ab551
Merge branch 'master' into codex/queue-collapse
2026-07-30 20:52:12 +08:00
Hypatia May
acca880015
Merge latest origin/master into fix/human-transcript-projection
...
Build-review integration round 2.
2026-07-30 20:51:45 +08:00
Tianyi Cui
bec424b9f3
Merge latest master into worktree-config-settings-seam
2026-07-30 20:51:34 +08:00
Hypatia May
c6e06e289e
Merge origin/master into fix/human-transcript-projection
...
Build-review integration round 1.
2026-07-30 20:45:39 +08:00
Yichen Jiang
ff5b65bb62
Merge latest master into worktree-config-settings-seam
...
# Conflicts:
# packages/typert/generator/tests/cordis-catalog-contract.spec.ts
2026-07-30 20:28:25 +08:00
Chinesezjc
b76a551e10
docs: re-record ui-conversation README pairing after master merge
2026-07-30 20:25:05 +08:00
Chinesezjc
5134147d63
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
2026-07-30 20:24:47 +08:00
Wenlu Wang
9dc5b4f58d
Merge branch 'master' into codex/queue-collapse
2026-07-30 20:24:12 +08:00
creatixchu
0ea0aef41a
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 20:23:11 +08:00
creatixchu
b6fc6328f3
Merge remote-tracking branch 'origin/master' into feat/directory-picker-quiet-navigation
2026-07-30 20:22:35 +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
imccyu
e3388cee87
ci: reduce typert cost
2026-07-30 20:03:58 +08:00