imccyu
69a58ddd6f
Merge branch 'master' into feat/ask-question-gui
2026-07-30 15:50:59 +08:00
Tianyi Cui
2550882875
Merge branch 'master' into worktree/persistent-bash-str-replace-editor
2026-07-30 15:19:27 +08:00
imccyu
6ea1238714
docs(web): the composer bar is one session-maybe slot, not a swapped pair
...
fix(web): keep one composer bar DOM across the no-workspace transition
The composer.bar slot moves from session to session-maybe scope: with no
current session the entry still mounts, the machine faces (keyboard, stop,
command) arrive undefined, and the bar renders its normal DOM inert via the
disabled owner prop. DisabledInputBar and its parallel tree are gone, so the
textarea node survives the cold-start workspace pick instead of flashing
through a remount. A blank session whose workspace was deleted takes the
same inert path through owner props.
test(web): add the composer DOM-continuity acceptance probe
Drives a real dsh web server with headless chromium through the cold-start
-> pick-workspace -> type flow and asserts the composer textarea is the
same DOM node throughout (a marker property must survive). Rerun
prerequisites are in the header comment.
docs(web): session-maybe identity is adoption, not hold-forever
fix(web): session-maybe entries adopt the first session, then remount like strict entries
A session-maybe entry used to keep one React instance across every
transition, so component-local state leaked between sessions once the
composer bar moved to that scope (PermissionSelect's optimistic pick, the
IME composition guard). Identity is now adoption: an incarnation born
session-less holds through the arrival of the first session (the blank
shell's DOM survives the workspace pick), and afterwards behaves exactly
like a strict session entry — a switch or a drop to no-session remounts,
clearing local state by construction. The child key is an incarnation
counter kept in the stable outlet wrapper via render-phase setState.
chore: knip knows the root acceptance probe's playwright dependency
scripts/hero-composer-dom-continuity.mjs resolves playwright through
apps/web's devDependency tree (createRequire), which knip cannot follow;
ignore it at the root workspace.
2026-07-30 15:18:06 +08:00
imccyu
6c7520c652
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/question-composer/ui.expected.md
2026-07-30 15:04:59 +08:00
imccyu
03936cb320
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# packages/client/ui-question/package.json
# packages/client/ui-question/src/client/QuestionComposer.tsx
# packages/client/ui-question/src/client/contract/slots.ts
# packages/client/ui-question/src/client/index.ts
# packages/client/ui-question/src/client/locales.ts
# packages/client/ui-question/tests/browser-plugin.spec.ts
# packages/client/ui-question/tests/question-composer.spec.tsx
2026-07-30 15:01:10 +08:00
imccyu
4869e0bbfc
Merge branch 'master' into worktree-fetest
2026-07-30 13:09:53 +08:00
imccyu
20cac781a2
Merge branch 'master' into worktree-fetest
2026-07-30 12:56:54 +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
imccyu
9035b1b474
docs(testing): record browser gate timing
2026-07-30 12:01:31 +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
imccyu
d9fa79a1e1
test(web): pin browser replay locale
2026-07-30 11:39:11 +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
72c9d40ad9
ci: isolate web snapshots to consumer lane
2026-07-30 10:54:51 +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
kingwl
112b0fbad1
fix(web): address queue review feedback
2026-07-30 04:12:38 +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
kingwl
7ce330f0e4
refactor(agent): scope queue actions to edit and remove
2026-07-30 01:58:51 +08:00
imccyu
93fc1e2ab8
Merge branch 'master' into feat/ask-question-gui
2026-07-30 01:46:05 +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
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
imccyu
643f9be33f
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# apps/web/tests/todo-display.snapshot.ts
# docs/event-producer-consumer.md
2026-07-30 01:16:46 +08:00
Tianyi Cui
b7dbb25c08
docs: clarify release tooling exclusion
2026-07-30 01:14:25 +08:00
Tianyi Cui
0e53b7a8aa
cleanup(build): drop helper architecture parsing
2026-07-30 01:07:47 +08:00
kingwl
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
imccyu
d9eb3545d8
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# packages/client/tsdown.client.ts
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/PendingCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
# packages/client/ui-conversation/src/client/toolviews/todo-row.module.css
# packages/client/ui-conversation/src/client/toolviews/todo-row.tsx
# packages/client/ui-conversation/tests/chat-apply.spec.tsx
# packages/client/ui-conversation/tests/coverage-tails.spec.tsx
# packages/client/ui-conversation/tests/todo-panel.spec.tsx
# packages/client/ui-primitives/src/icons/index.tsx
# packages/client/ui-primitives/tests/icons.spec.tsx
# packages/client/ui-question/README.i18n.yaml
# packages/client/ui-question/src/client/QuestionComposer.module.css
# packages/client/ui-question/src/client/QuestionComposer.tsx
2026-07-30 01:01:14 +08:00
kingwl
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
Tianyi Cui
3d5fe9ffab
Merge branch 'master' into fix/hook-matcher-validation
2026-07-30 00:21:43 +08:00
Tianyi Cui
91a104acef
docs(pty): explain spawn-helper override precedence
2026-07-30 00:20:44 +08:00
Tianyi Cui
92052c1220
docs(persistent-bash): define cancellation reset
2026-07-30 00:18:55 +08:00
Tianyi Cui
9549c73f30
fix(persistent-bash): distinguish shell exit status
2026-07-30 00:15:39 +08:00
Tianyi Cui
0440c4cc0c
Merge latest master into codex/migrate-to-oxlint
2026-07-30 00:13:30 +08:00
07akioni
a150cbc63b
Merge branch 'master' into fix/ui-action-display
2026-07-30 00:10:25 +08:00
07akioni
b71fbe770d
fix: ci
2026-07-30 00:08:59 +08:00
