674c25a6a2
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# docs/tool-catalog.md
# examples/package.json
# packages/examples/agent-spine-demo/README.i18n.yaml
# packages/examples/agent-spine-demo/README.zh.md
# pnpm-lock.yaml
2026-07-30 16:11:21 +08:00
2550882875
Merge branch 'master' into worktree/persistent-bash-str-replace-editor
2026-07-30 15:19:27 +08:00
39efc3dd73
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# .agents/notes/implemented/testing/2026-07-24-web-gui-browser-e2e-lane.i18n.yaml
# docs/testing.i18n.yaml
2026-07-30 15:00:42 +08:00
36f6d8fd05
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-07-30 14:58:10 +08:00
a51143bded
fix(cli): close shared config review gaps
2026-07-30 14:56:39 +08:00
4869e0bbfc
Merge branch 'master' into worktree-fetest
2026-07-30 13:09:53 +08:00
20cac781a2
Merge branch 'master' into worktree-fetest
2026-07-30 12:56:54 +08:00
01324f9167
Merge branch 'master' into fix/input-ui
2026-07-30 12:55:57 +08:00
cea5e868ff
Merge remote-tracking branch 'origin/master' into worktree/retarget-pr831-20260729
2026-07-30 12:21:14 +08:00
9cb9a3e767
Merge branch 'master' into worktree-fetest
2026-07-30 12:20:27 +08:00
b44318b03d
Merge branch 'master' into fix/input-ui
2026-07-30 12:20:01 +08:00
d37b192aa9
Merge branch 'master' into fix/workspace-instruction-frame-metadata
2026-07-30 12:16:41 +08:00
9035b1b474
docs(testing): record browser gate timing
2026-07-30 12:01:31 +08:00
5a490553bc
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# docs/event-producer-consumer.md
# packages/host/apiproxy/README.i18n.yaml
# tsconfig.base.json
2026-07-30 12:00:15 +08:00
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
3f195f1dd1
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
2026-07-30 11:57:55 +08:00
b523a04af8
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:51:09 +08:00
c0474d5289
Merge branch 'master' into codex/experimental-plugin-group-note
2026-07-30 11:46:04 +08:00
ecb43469af
Merge branch 'master' into fix/workspace-instruction-frame-metadata
2026-07-30 11:45:00 +08:00
02a9d4113e
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:40:34 +08:00
d9fa79a1e1
test(web): pin browser replay locale
2026-07-30 11:39:11 +08:00
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
208944645c
fix(cli): align shared config lifecycle docs
2026-07-30 11:34:46 +08:00
a9813a2801
Merge branch 'master' into codex/web-queue-actions
2026-07-30 11:20:57 +08:00
aae1b48535
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:17:03 +08:00
6303b22487
ci: run web replay on master linux
2026-07-30 11:16:37 +08:00
b92c6bcc66
Merge branch 'master' into fix/ui-action-display
2026-07-30 11:15:35 +08:00
72c9d40ad9
ci: isolate web snapshots to consumer lane
2026-07-30 10:54:51 +08:00
c086de2074
fix(docs): align catalogs with consolidated CLI
2026-07-30 10:34:21 +08:00
4b4f7752c1
ci: gate web browser snapshots
2026-07-30 10:23:05 +08:00
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
5dbcedfbba
Merge origin/master into feature/shared-cli-config-foundation
2026-07-30 10:11:38 +08:00
112b0fbad1
fix(web): address queue review feedback
2026-07-30 04:12:38 +08:00
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
7ce330f0e4
refactor(agent): scope queue actions to edit and remove
2026-07-30 01:58:51 +08:00
c8cdc42418
Merge remote-tracking branch 'origin/master' into codex/experimental-plugin-group-note
2026-07-30 01:38:34 +08:00
78cf5de686
Merge origin/master into fix/hook-matcher-validation
2026-07-30 01:38:18 +08:00
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
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
014e39203e
Merge commit '3a1b995e4fc3eb9acd6324c4b581f7aeb110b8be' into worktree/retarget-pr828-20260729
2026-07-30 01:18:18 +08:00
b7dbb25c08
docs: clarify release tooling exclusion
2026-07-30 01:14:25 +08:00
0e53b7a8aa
cleanup(build): drop helper architecture parsing
2026-07-30 01:07:47 +08:00
76e14793a9
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.i18n.yaml
# docs/event-producer-consumer.md
2026-07-30 01:04:25 +08:00
c97b1d025e
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
...
# Conflicts:
# apps/web/tsconfig.json
# docs/architecture.i18n.yaml
# docs/event-producer-consumer.md
# packages/client/runtime/README.i18n.yaml
# packages/client/tsdown.client.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent/README.i18n.yaml
# packages/core/agent/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# tsconfig.host.json
2026-07-30 00:30:38 +08:00
3d5fe9ffab
Merge branch 'master' into fix/hook-matcher-validation
2026-07-30 00:21:43 +08:00
91a104acef
docs(pty): explain spawn-helper override precedence
2026-07-30 00:20:44 +08:00
92052c1220
docs(persistent-bash): define cancellation reset
2026-07-30 00:18:55 +08:00
9549c73f30
fix(persistent-bash): distinguish shell exit status
2026-07-30 00:15:39 +08:00
0440c4cc0c
Merge latest master into codex/migrate-to-oxlint
2026-07-30 00:13:30 +08:00
a150cbc63b
Merge branch 'master' into fix/ui-action-display
2026-07-30 00:10:25 +08:00
Turtle