creatixchu
fcab9b9e9c
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 14:50:59 +08:00
imccyu
ac37caa1ee
Merge branch 'master' into worktree-fetest
2026-07-30 14:31:44 +08:00
imccyu
4869e0bbfc
Merge branch 'master' into worktree-fetest
2026-07-30 13:09:53 +08:00
imccyu
1b84126f70
Merge branch 'master' into worktree/short-default-labels
2026-07-30 13:08:34 +08:00
imccyu
20cac781a2
Merge branch 'master' into worktree-fetest
2026-07-30 12:56:54 +08:00
imccyu
432a64ef2f
Merge branch 'master' into worktree/short-default-labels
2026-07-30 12:56:11 +08:00
imccyu
01324f9167
Merge branch 'master' into fix/input-ui
2026-07-30 12:55:57 +08:00
Tianyi Cui
cea5e868ff
Merge remote-tracking branch 'origin/master' into worktree/retarget-pr831-20260729
2026-07-30 12:21:14 +08:00
imccyu
9cb9a3e767
Merge branch 'master' into worktree-fetest
2026-07-30 12:20:27 +08:00
imccyu
b44318b03d
Merge branch 'master' into fix/input-ui
2026-07-30 12:20:01 +08:00
Tianyi Cui
d37b192aa9
Merge branch 'master' into fix/workspace-instruction-frame-metadata
2026-07-30 12:16:41 +08:00
Tianyi Cui
3ecd4a569a
test(skill-local): cover root unlink rewatch
2026-07-30 12:02:21 +08:00
imccyu
6e99027917
Merge remote-tracking branch 'origin/master' into mergebot/pr937
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/queue/QueueDock.module.css
2026-07-30 11:59:59 +08:00
Tianyi Cui
3f195f1dd1
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
2026-07-30 11:57:55 +08:00
imccyu
b523a04af8
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:51:09 +08:00
Tianyi Cui
c0474d5289
Merge branch 'master' into codex/experimental-plugin-group-note
2026-07-30 11:46:04 +08:00
Tianyi Cui
ecb43469af
Merge branch 'master' into fix/workspace-instruction-frame-metadata
2026-07-30 11:45:00 +08:00
imccyu
02a9d4113e
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:40:34 +08:00
kingwl
ad1bb84425
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 11:38:54 +08:00
imccyu
a9813a2801
Merge branch 'master' into codex/web-queue-actions
2026-07-30 11:20:57 +08:00
imccyu
aae1b48535
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:17:03 +08:00
imccyu
6303b22487
ci: run web replay on master linux
2026-07-30 11:16:37 +08:00
07akioni
b92c6bcc66
Merge branch 'master' into fix/ui-action-display
2026-07-30 11:15:35 +08:00
imccyu
60620ec36c
Green the jsdom lane for the composer-seat ResizeObserver and new StatsLine format
...
The seat's height publisher needs a ResizeObserver stub in every spec that
renders ConversationRoot (jsdom has none), and the two branch-tail StatsLine
assertions move to the grouped detail-row output.
2026-07-30 11:09:03 +08:00
Tianyi Cui
c38a7c3a89
Merge branch 'master' into fix/hook-matcher-validation
2026-07-30 10:57:24 +08:00
imccyu
b94df7348f
Merge branch 'master' into codex/web-queue-actions
2026-07-30 10:50:34 +08:00
Yichen Jiang
fb4b8f3973
Merge remote-tracking branch 'origin/master' into worktree/short-default-labels
...
# Conflicts:
# packages/client/ui-model/src/client/ModelSelect.tsx
# packages/client/ui-model/tests/model-select.spec.tsx
2026-07-30 10:47:35 +08:00
imccyu
4b4f7752c1
ci: gate web browser snapshots
2026-07-30 10:23:05 +08:00
Yif
04f6dfdc29
Web composer stats detail row and input-zone polish
...
Stats line moves into the InputBar's new footer slot (sharing the card's
width column) and expands to the design's grouped detail row: turns/steps,
LLM and tool wall time, cache hit, and input/output token split, all
derived client-side from the snapshot. The composer stack owns one 8px
rhythm, the seat fades the transcript through a fixed 36px gradient band,
back-to-bottom follows a live --dsh-composer-height, and goal/todo strips
share one 752px tip-fill column.
2026-07-30 10:22:44 +08:00
creatixchu
0d5cf7ce4e
Merge origin/master (oxlint migration, webtest migration)
...
Conflict: apps/web/tests/workspace-flow.snapshot.ts was deleted on
master (#921 sinks assembled-app journeys to package-level benches)
and modified here (show-hidden/prefix-filter and crumb-back lanes).
Resolved by taking the deletion: the same behaviors are asserted at
package level in directory-picker-browse's directory-browser.spec.tsx
and client-flow.spec.tsx, which is the post-migration home for them.
2026-07-30 09:32:55 +08:00
creatixchu
b46dcb16cb
revert: restore the reviewer-approved tree (97a192d7b)
...
ZiyaZhang approved 97a192d7b; the subsequent bot-review rounds (7-24)
landed after that approval and were not requested by a human reviewer.
This commit restores the approved tree verbatim as a forward commit
(pushed history stays intact). git diff 97a192d7b is empty.
2026-07-30 09:22:16 +08:00
kingwl
112b0fbad1
fix(web): address queue review feedback
2026-07-30 04:12:38 +08:00
creatixchu
53e85101b9
fix(host,client): review round 24 — close-edge facts synced; wire-hop pointer; platform-flavored double join; loading reset
2026-07-30 03:38:43 +08:00
kingwl
ebbcfdd03b
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# packages/core/agent-loop/src/agent.ts
2026-07-30 03:33:41 +08:00
creatixchu
df313b7531
fix(host,client): review round 23 — create-path contract at every client declaration; close-edge resets; NFD tripwire; canonical double join
2026-07-30 03:17:30 +08:00
creatixchu
de24461b91
fix(host): review round 22 — note enumeration includes the create path; cross-method equality pinned; NFD-volume boundary recorded
2026-07-30 02:53:45 +08:00
creatixchu
56ac56bb26
fix(host): review round 21 — create-path shape promised; lexical-not-realpath named; hermetic-only home probes; enumerations point at the contract
2026-07-30 02:30:05 +08:00
creatixchu
983e6d07a4
fix(host): review round 20 — canonical shape declared at the interface; hermetic home-shape spec; single resolve
2026-07-30 02:10:07 +08:00
kingwl
7ce330f0e4
refactor(agent): scope queue actions to edit and remove
2026-07-30 01:58:51 +08:00
imccyu
606b6aa78c
Merge remote-tracking branch 'origin/master' into worktree-locale
...
# Conflicts:
# packages/client/ui-slots/src/index.ts
2026-07-30 01:53:28 +08:00
creatixchu
cc92b6b578
fix(host,client): review round 19 — home ships resolved on the wire; client mirror shrinks to the draft side; scoped focus guarantee
2026-07-30 01:50:45 +08:00
imccyu
622450192d
fix(client): mark the parallel register overloads for the clone gate
...
The two overload declarations differ only in the inject share; folding them
would lose per-overload inference of I, so the duplication is deliberate.
2026-07-30 01:40:10 +08:00
Tianyi Cui
c8cdc42418
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
2026-07-30 01:38:34 +08:00
Tianyi Cui
78cf5de686
Merge origin/master into fix/hook-matcher-validation
2026-07-30 01:38:18 +08:00
Tianyi Cui
401afde164
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
...
# Conflicts:
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
2026-07-30 01:32:41 +08:00
creatixchu
9545914c10
fix(host): review round 18 — draft dirs fully normalized; JSDoc reattached; third parking target documented
2026-07-30 01:28:55 +08:00
Tianyi Cui
7ba061446d
docs(acp-snapshot): widen posix-only contract
2026-07-30 01:27:52 +08:00
imccyu
e56c0699a9
Merge branch 'master' into codex/web-queue-actions
2026-07-30 01:21:13 +08:00
Tianyi Cui
4582e1425c
Merge commit 'refs/codex/pr885/master-20260730' into worktree/retarget-pr885-20260729
...
# Conflicts:
# eslint.config.mjs
2026-07-30 01:18:28 +08:00
Tianyi Cui
014e39203e
Merge commit '3a1b995e4fc3eb9acd6324c4b581f7aeb110b8be' into worktree/retarget-pr828-20260729
2026-07-30 01:18:18 +08:00
