Tianyi Cui
4a4b79747a
Merge commit '02ecbfaeec2d93d9d6f8d070f4a968be44a784bb' into worktree/retarget-pr828-20260729
2026-07-29 23:23:32 +08:00
Tianyi Cui
f477cafc90
Merge commit '01b34d4ff9e0726379b2d0c3febdc977e5ce9ebf' into worktree/retarget-pr828-20260729
2026-07-29 23:20:18 +08:00
imccyu
b8f40e00bb
Merge branch 'master' into fix/gui-todo-default-collapsed
2026-07-29 23:18:28 +08:00
Tianyi Cui
99daef69ef
fix(hooks): remove speculative regex runtime
2026-07-29 23:15:15 +08:00
ZiyaZhang
3dd0ce33f4
Merge remote-tracking branch 'upstream/master' into fix/gui-todo-default-collapsed
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 08:10:13 -07:00
Tianyi Cui
cfe77b3a35
Merge commit '834d9dbbceec1b41b009a7d809364adb52aeec43' into worktree/retarget-pr828-20260729-r3
2026-07-29 23:01:22 +08:00
Tianyi Cui
a1215886a8
Merge origin/master at 834d9dbbce into skill catalog hot refresh
2026-07-29 22:41:57 +08:00
Tianyi Cui
4b9fde2ed4
Merge origin/master at e2e412656a into skill catalog hot refresh
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-29 22:37:31 +08:00
imccyu
67acf86b2e
Merge branch 'master' into fix/page-scroll
2026-07-29 22:35:13 +08:00
imccyu
20c446e033
Merge branch 'master' into worktree-renameweb
2026-07-29 22:28:34 +08:00
Tianyi Cui
db543ffa85
fix(skill): bound catalog discovery retries
2026-07-29 22:27:49 +08:00
imccyu
b0ee207a2a
Merge remote-tracking branch 'origin/master' into mergebot/pr908
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 22:27:37 +08:00
imccyu
55ff7761b0
Merge branch 'master' into fix/page-scroll
2026-07-29 22:22:01 +08:00
imccyu
98a23fc88c
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:20:09 +08:00
imccyu
2b56d972eb
Merge remote-tracking branch 'origin/master' into mergebot/pr908
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-trajectory/src/client/views.module.css
2026-07-29 22:15:22 +08:00
Tianyi Cui
c10c72837b
fix(skill): close watchers after probe disposal
2026-07-29 22:13:57 +08:00
Tianyi Cui
637c5c9b7b
Merge remote-tracking branch 'origin/master' into worktree/fix-agent-loop-scheduler-quiescence
2026-07-29 22:10:52 +08:00
imccyu
fd356b92c8
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:10:39 +08:00
Tianyi Cui
1a21fc3a06
fix(agent-loop): quiesce scheduler failures
2026-07-29 22:10:26 +08:00
Tianyi Cui
345b58d1de
Merge commit 'ddeb1cab2dcffcb4bc9f71bd3151c9b3078b5667' into worktree/retarget-pr828-20260729
2026-07-29 22:08:48 +08:00
Tianyi Cui
d10dde430c
Merge origin/master at ddeb1cab2d into skill catalog hot refresh
2026-07-29 21:55:32 +08:00
imccyu
32c3d1e17f
Merge remote-tracking branch 'origin/master' into worktree-renameweb
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/test-runtime/src/sessions.ts
2026-07-29 21:45:29 +08:00
Tianyi Cui
16e1734444
Merge origin/master at 90bc53cc64 into skill catalog hot refresh
2026-07-29 21:43:13 +08:00
Tianyi Cui
502e64c00d
Merge origin/master at ecbf75a5e7 into skill catalog hot refresh
2026-07-29 21:42:18 +08:00
Tianyi Cui
a45a187a90
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr828-20260729
2026-07-29 21:42:13 +08:00
Tianyi Cui
d70cfed4e8
Merge master into fix/subprocess-password-scrub
2026-07-29 21:40:50 +08:00
imccyu
f4bc0a4a86
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:40:28 +08:00
Tianyi Cui
a5446e3160
Merge master into fix/subprocess-password-scrub
...
# Conflicts:
# packages/lsp/lsp-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.zh.md
2026-07-29 21:38:24 +08:00
Tianyi Cui
7f711996ff
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr828-20260729
...
# Conflicts:
# packages/hooks/README.i18n.yaml
# packages/hooks/README.zh.md
# packages/hooks/hook-protocol/README.i18n.yaml
# packages/hooks/hook-protocol/README.zh.md
# packages/hooks/hooks-claude/README.i18n.yaml
# packages/hooks/hooks-claude/README.zh.md
# packages/hooks/hooks-codex/README.i18n.yaml
# packages/hooks/hooks-codex/README.zh.md
2026-07-29 21:34:29 +08:00
imccyu
f2aa63f756
Merge branch 'master' into worktree-renameweb
2026-07-29 21:25:14 +08:00
imccyu
76b4563380
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:23:13 +08:00
imccyu
70c6ffda7e
Merge branch 'master' into fix/page-scroll
2026-07-29 21:21:25 +08:00
imccyu
bf8db964d4
Merge branch 'master' into xtr/trajectory-inspection-ui
2026-07-29 21:20:38 +08:00
Tianyi Cui
52d68a5383
fix(skill): retain candidates across watcher failures
2026-07-29 21:17:27 +08:00
Tianyi Cui
48cf50fc55
fix(skill): cancel opening watchers on dispose
2026-07-29 21:17:04 +08:00
Tianyi Cui
e9233123eb
fix(skill): ignore unchanged missing-root probes
2026-07-29 21:12:01 +08:00
imccyu
45b21bcc3c
fix(client): mark independent replay projections
2026-07-29 21:07:53 +08:00
07akioni
08d097077e
fix: cr
2026-07-29 21:03:40 +08:00
Tianyi Cui
4997846e45
refactor(hooks): simplify regex pool entry
2026-07-29 20:58:28 +08:00
imccyu
6e8ad4b382
Merge remote-tracking branch 'origin/master' into worktree-renameweb
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.zh.md
# packages/session-title/session-title/README.i18n.yaml
# packages/session-title/session-title/README.zh.md
2026-07-29 20:58:22 +08:00
imccyu
b23c3d596a
Merge remote-tracking branch 'origin/master' into trajectory-history-source
2026-07-29 20:58:04 +08:00
07akioni
2a12057345
fix: ci
2026-07-29 20:56:56 +08:00
Tianyi Cui
b060b6f5f6
Merge commit 'refs/codex/pr758/master' into HEAD
...
# Conflicts:
# packages/context/README.i18n.yaml
# packages/context/README.zh.md
2026-07-29 20:55:09 +08:00
Yif
be9042e5a1
docs(client): sync package READMEs and agent notes with the input interaction rework
...
Update the six touched client package README pairs (slash menu ordering,
localized group titles and dismiss, permission label twin, goal pause,
plan hint localization, useAnchoredMaxHeight) and keep the owning agent
notes current: SlashSource.order and the MenuView dismiss/localize/clamp
face in the slash-pipeline note, the pause verb in the goal bar note.
2026-07-29 20:46:29 +08:00
imccyu
64acc5874b
test(client): cover independent trajectory history
2026-07-29 20:46:02 +08:00
Tianyi Cui
cf390cc6fd
fix(skill): recognize empty catalog tombstones
2026-07-29 20:44:06 +08:00
07akioni
382884e237
fix: scroll to bottom
2026-07-29 20:39:45 +08:00
07akioni
63e1054916
Merge branch 'master' into fix/page-scroll
2026-07-29 20:36:11 +08:00
07akioni
a4602b959e
feat: optimize chat page scroll area
2026-07-29 20:26:48 +08:00
xjt
795bdda223
Merge remote-tracking branch 'origin/master' into xjt/readme-proofreading-batch-1
...
# Conflicts:
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/README.zh.md
2026-07-29 20:21:48 +08:00
Tianyi Cui
imccyu
ZiyaZhang
07akioni
Yif
xjt