Yichen Jiang
e37680ffb7
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
2026-07-30 22:21:06 +08:00
creatixchu
82df6dcc0b
fix(cli): avoid duplicate attachment backend
2026-07-30 20:33:11 +08:00
creatixchu
782c064d03
Merge remote-tracking branch 'origin/worktree/web-multimodal-image-input' into worktree/web-multimodal-image-input
...
# Conflicts:
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
2026-07-30 20:05:34 +08:00
creatixchu
98ed9d8d4b
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# apps/cli/cordis.yml
# apps/cli/package.json
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
# pnpm-lock.yaml
2026-07-30 20:04:22 +08:00
Yichen Jiang
4e17b23174
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-30 20:02:30 +08:00
Yichen Jiang
bc87c91bcd
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# apps/cli/cordis.yml
# apps/cli/package.json
# apps/cli/src/bin.ts
# apps/cli/tests/args.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
# pnpm-lock.yaml
2026-07-30 19:54:30 +08:00
creatixchu
692ada7485
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 19:48:45 +08:00
imccyu
a1f1f9c29a
Merge branch 'master' into codex/figma-context-injection-row
2026-07-30 19:20:21 +08:00
creatixchu
5e4922a761
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
...
# Conflicts:
# apps/cli/cordis.yml
# packages/host/README.i18n.yaml
2026-07-30 18:41:41 +08:00
creatixchu
33bb266932
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 18:29:37 +08:00
Tianyi Cui
66e182b516
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:35:47 +08:00
kingwl
0f0564b3d0
Merge origin/master into codex/figma-context-injection-row
2026-07-30 17:35:04 +08:00
creatixchu
eba513340c
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:34:59 +08:00
kingwl
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
creatixchu
295813f6eb
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:32:46 +08:00
creatixchu
8cf1603d56
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:18:43 +08:00
creatixchu
b8d9fb1ede
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:17:03 +08:00
creatixchu
352d669e4d
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
2026-07-30 17:16:28 +08:00
imccyu
4cd5745b94
Merge branch 'master' into codex/details-default-closed
2026-07-30 17:14:51 +08:00
creatixchu
85a2789833
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
2026-07-30 17:10:36 +08:00
Tianyi Cui
abd7d57358
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:08:42 +08:00
creatixchu
3651ba3461
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
2026-07-30 17:06:19 +08:00
creatixchu
3809795fd5
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:02:33 +08:00
imccyu
34d5f8f2e2
Merge branch 'master' into feat/ask-question-gui
2026-07-30 16:55:54 +08:00
imccyu
f87692a5c3
test(web): anchor the group section above the HoverCard wrapper
...
The workspace header row is now wrapped by its HoverCard anchor span
(0b4a6196f), so the row's immediate parent no longer holds the session
subtree; the delete scenario anchors on the groupSection ancestor
instead. The flat-view and dwell failures were downstream of this one
(shared page state).
2026-07-30 16:54:43 +08:00
Turtle
3c620a0cb6
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# docs/cordis-catalog/services.md
# packages/host/apiproxy/README.i18n.yaml
2026-07-30 16:53:55 +08:00
imccyu
34c124585a
fix: test
2026-07-30 16:46:50 +08:00
kingwl
d7641ec028
Merge origin/master into codex/figma-context-injection-row
2026-07-30 16:20:47 +08:00
kingwl
17893c503e
feat(web): match context injection disclosure design
2026-07-30 16:20:34 +08:00
creatixchu
bfbab9d2ab
Merge remote-tracking branch 'origin/feat/directory-picker-quiet-navigation' into feat/dir-selector-adaptive-default
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-28-directory-picker-capability-seam.i18n.yaml
2026-07-30 16:20:22 +08:00
creatixchu
981ef5bfa0
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
2026-07-30 15:57:36 +08:00
imccyu
d34bc5bfa4
test(web): pick up the plan chip in the answered composer golden
...
The always-visible plan-mode toggle (fe9191934) adds one composer-row
button; the answered transcript golden re-records with it.
2026-07-30 15:44:53 +08:00
imccyu
17fea637d5
Merge branch 'master' into codex/details-default-closed
2026-07-30 15:40:36 +08:00
imccyu
e184b9561a
Merge branch 'master' into feat/ask-question-gui
2026-07-30 15:36:22 +08:00
Hypatia May
30667e1eb9
Merge remote-tracking branch 'origin/master' into feat/session-inherited-boundary
2026-07-30 15:34:55 +08:00
Hypatia May
9d26815126
test(web): wait for the driven session before snapshotting
2026-07-30 15:32:17 +08:00
creatixchu
4795904c70
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 15:30:39 +08:00
Turtle
da5f1878c0
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
2026-07-30 15:29:47 +08:00
creatixchu
c90410deaa
Merge remote-tracking branch 'origin/master' into feat/dir-selector-adaptive-default
2026-07-30 15:25:46 +08:00
imccyu
ecd07abdc0
test(web): refresh question-composer goldens for the merged composer
...
The master-side refresh batch recorded these goldens against master's
composer (customTrigger row, header pager); the merge keeps this
branch's redesigned composer (always-visible custom input, footer
pager) with copy on the standard locale seat, so the waiting aria and
the answered transcript re-record against the merged UI. The answered
golden also picks up the ask_user_question toolview row this branch
introduces.
2026-07-30 15:07:31 +08:00
creatixchu
fc8e059a2f
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
2026-07-30 15:04:35 +08:00
creatixchu
0ad6bf4b06
test(web): re-record directory-browser golden after master merge
...
The English-locale golden refreshed on master (8c753fd8f1) was recorded
against master's pre-miller dialog; this branch's own golden predated the
miller two-pane landing and was never enforced before the web browser
snapshot CI gate landed. Re-recorded against the merged tree: two-pane
landing plus the show-hidden footer toggle.
2026-07-30 15:00:43 +08:00
Turtle
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
Turtle
a51143bded
fix(cli): close shared config review gaps
2026-07-30 14:56:39 +08:00
imccyu
5c2fc03d8f
Merge branch 'master' into codex/details-default-closed
2026-07-30 14:50:50 +08:00
_Kerman
df25ca41dc
Merge remote-tracking branch 'github/master' into xtr/fix-trajectory-scroll-layering
2026-07-30 14:45:16 +08:00
_Kerman
c0b8fea4c8
fix(ui): contain trajectory scrolling and overlays
2026-07-30 14:45:07 +08:00
kingwl
4ef3e60d57
fix(web): keep details closed by default
2026-07-30 14:42:39 +08:00
creatixchu
0a9b6e75d6
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
# packages/client/connection/src/client/fixture.ts
# packages/client/connection/tests/fake-api.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/contract/session.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/runtime/tests/fake-api.ts
# packages/client/test-runtime/src/sessions.ts
# packages/client/test-runtime/tests/runtime.spec.tsx
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/service.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/queue-dock.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/src/api/rpc-map.ts
# packages/host/apiproxy/src/api/rpc.schema.ts
# packages/host/apiproxy/src/api/rpc.ts
# packages/host/apiproxy/src/api/sessions.schema.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/fetch/client.ts
# packages/host/apiproxy/src/fetch/handler.ts
# packages/host/apiproxy/tests/api-proxy-commands.spec.ts
# packages/host/apiproxy/tests/client-handler.spec.ts
# packages/host/apiproxy/tests/fetch-carrier.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
2026-07-30 13:48:33 +08:00
imccyu
291fe1e823
test(web): refresh composer stats expected outputs
2026-07-30 13:15:57 +08:00
