d67b80f2fd
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 20:27:47 +08:00
a1f1f9c29a
Merge branch 'master' into codex/figma-context-injection-row
2026-07-30 19:20:21 +08:00
20a5aaa10c
Merge branch 'master' into xtr/trajectory-timeline-click-focus
2026-07-30 18:43:12 +08:00
1f5d09c2d7
Merge origin/master into codex/figma-context-injection-row
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 18:27:49 +08:00
f296fd3075
Merge remote-tracking branch 'github/master' into xtr/trajectory-timeline-click-focus
...
# Conflicts:
# apps/web/tests/details-session-lifecycle.e2e.ts
# packages/client/ui-layout/README.i18n.yaml
2026-07-30 18:08:22 +08:00
daed49ad54
perf(ui-trajectory): reuse finalized stream projections
2026-07-30 18:05:49 +08:00
53ff5c6ef2
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 18:02:07 +08:00
7ec01dad08
fix(ui-trajectory): bound expensive record previews
2026-07-30 17:55:06 +08:00
c000bf3be8
fix(ui): hide sidebar resize pill
2026-07-30 17:43:45 +08:00
287289ddbc
feat(ui): highlight trajectory errors
2026-07-30 17:42:02 +08:00
66e182b516
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:35:47 +08:00
3d6cacc59b
Merge remote-tracking branch 'origin/master' into codex/composer-dock-stacking
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 17:35:22 +08:00
0f0564b3d0
Merge origin/master into codex/figma-context-injection-row
2026-07-30 17:35:04 +08:00
f5228e7c71
Merge origin/master into codex/figma-context-injection-row
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
2026-07-30 17:34:14 +08:00
3c4a185e35
fix(ui): balance trajectory context icon
2026-07-30 17:28:04 +08:00
abf498b8dc
fix(web): align composer context stack
2026-07-30 17:26:44 +08:00
80e55ecaf8
fix(ui): enlarge trajectory context icon
2026-07-30 17:21:28 +08:00
4cd5745b94
Merge branch 'master' into codex/details-default-closed
2026-07-30 17:14:51 +08:00
0bc495c465
Merge remote-tracking branch 'github/master' into xtr/trajectory-timeline-click-focus
2026-07-30 17:12:30 +08:00
411bbdf2aa
feat(ui): compact trajectory role labels
2026-07-30 17:11:07 +08:00
abd7d57358
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:08:42 +08:00
997932ffd6
feat(ui): refine trajectory timeline interaction
2026-07-30 17:00:58 +08:00
34c124585a
fix: test
2026-07-30 16:46:50 +08:00
d7641ec028
Merge origin/master into codex/figma-context-injection-row
2026-07-30 16:20:47 +08:00
17893c503e
feat(web): match context injection disclosure design
2026-07-30 16:20:34 +08:00
17fea637d5
Merge branch 'master' into codex/details-default-closed
2026-07-30 15:40:36 +08:00
e184b9561a
Merge branch 'master' into feat/ask-question-gui
2026-07-30 15:36:22 +08:00
925cb0b315
feat(web): plan chip as an always-visible pressed-state toggle
...
fix: plan button add label
2026-07-30 15:33:45 +08:00
da5f1878c0
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
2026-07-30 15:29:47 +08:00
245aeb414c
feat(web): workspace header hover card with cwd and creation time
2026-07-30 15:29:12 +08:00
4c33ca8bec
fix: hero layout when no-workspace
2026-07-30 15:25:50 +08:00
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
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
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
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
5c2fc03d8f
Merge branch 'master' into codex/details-default-closed
2026-07-30 14:50:50 +08:00
df25ca41dc
Merge remote-tracking branch 'github/master' into xtr/fix-trajectory-scroll-layering
2026-07-30 14:45:16 +08:00
c0b8fea4c8
fix(ui): contain trajectory scrolling and overlays
2026-07-30 14:45:07 +08:00
4ef3e60d57
fix(web): keep details closed by default
2026-07-30 14:42:39 +08:00
ac37caa1ee
Merge branch 'master' into worktree-fetest
2026-07-30 14:31:44 +08:00
4869e0bbfc
Merge branch 'master' into worktree-fetest
2026-07-30 13:09:53 +08:00
1b84126f70
Merge branch 'master' into worktree/short-default-labels
2026-07-30 13:08:34 +08:00
432a64ef2f
Merge branch 'master' into worktree/short-default-labels
2026-07-30 12:56:11 +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
b523a04af8
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:51:09 +08:00
02a9d4113e
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:40:34 +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
aae1b48535
Merge remote-tracking branch 'origin/master' into worktree-fetest
2026-07-30 11:17:03 +08:00
imccyu