 Yichen Jiang
|
2701862bf1
|
Merge remote-tracking branch 'origin/master' into worktree/custom-deepseek-models
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-web-config-plane.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-30-web-config-plane.md
# .agents/notes/implemented/architecture/2026-07-30-web-config-plane.zh.md
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# packages/client/ui-models/README.i18n.yaml
# packages/client/ui-models/README.md
# packages/client/ui-models/README.zh.md
# packages/client/ui-models/src/client/ModelsSection.module.css
# packages/client/ui-models/src/client/ModelsSection.tsx
# packages/client/ui-models/tests/components.spec.tsx
# packages/host/apiproxy/README.i18n.yaml
|
2026-07-31 14:36:00 +08:00 |
|
|
Yichen Jiang
|
a332f2f333
|
feat(web): configure custom DeepSeek models
|
2026-07-31 14:08:59 +08:00 |
|
 imccyu
|
37827c461d
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/error-auth.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/plan-review/approved.expected.md
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/queue-actions/collapsed.expected.md
# apps/web/tests/snapshots/queue-actions/editing.expected.md
# apps/web/tests/snapshots/queue-actions/ui.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/tests/input-bar.spec.tsx
|
2026-07-31 11:25:16 +08:00 |
|
 ZiyaZhang
|
83d6be50aa
|
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
|
2026-07-30 19:32:51 -07:00 |
|
|
imccyu
|
ce57438ac0
|
Merge branch 'master' into codex/new-task
|
2026-07-31 10:23:14 +08:00 |
|
|
imccyu
|
9433259f05
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1005
# Conflicts:
# docs/module-graph.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-plan/README.i18n.yaml
# packages/client/ui-plan/README.md
# packages/client/ui-plan/README.zh.md
# packages/client/ui-plan/src/client/PlanModeControl.tsx
# packages/client/ui-plan/src/client/index.ts
# packages/client/ui-plan/tests/browser-plugin.spec.ts
# packages/client/ui-plan/tests/plan-mode-control.spec.tsx
|
2026-07-31 03:47:24 +08:00 |
|
|
imccyu
|
c9997311cf
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# packages/client/ui-command/src/client/PopupSelectView.tsx
# 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
# packages/client/ui-conversation/src/client/skeleton/PermissionSelect.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-conversation/tests/input-scenarios.spec.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/client/ui-primitives/src/Modal.tsx
# packages/client/ui-primitives/tests/atoms.spec.tsx
|
2026-07-31 03:14:44 +08:00 |
|
|
imccyu
|
810b45a377
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1008
# Conflicts:
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
# packages/client/ui-conversation/src/client/contract/terminal-card-model.ts
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-conversation/src/client/toolviews/ask-question-row.tsx
# packages/client/ui-conversation/src/client/toolviews/bash-sample.tsx
# packages/client/ui-conversation/src/client/toolviews/todo-row.tsx
# packages/client/ui-conversation/tests/chat-tool-row.spec.tsx
# packages/client/ui-conversation/tests/terminal-card.spec.tsx
# packages/client/ui-trajectory/tests/client-bundle.spec.ts
|
2026-07-31 03:00:08 +08:00 |
|
|
imccyu
|
8933d63143
|
test(web): align e2e anchors and goldens with the unified tool-row expand
|
2026-07-31 02:16:28 +08:00 |
|
|
imccyu
|
1e10966ef6
|
wip
fix: docs
|
2026-07-31 02:13:53 +08:00 |
|
|
ZiyaZhang
|
bf4ff3a696
|
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 09:20:43 -07:00 |
|
 Wenlu Wang
|
edefdd96b9
|
Merge remote-tracking branch 'origin/master' into codex/new-task
|
2026-07-31 00:10:46 +08:00 |
|
|
kingwl
|
1986de9ac1
|
fix(web): show plan status only while active
|
2026-07-30 22:42:25 +08:00 |
|
|
imccyu
|
3b370549a1
|
feat(client): increment forked session titles
|
2026-07-30 21:28:17 +08:00 |
|
|
imccyu
|
213de9a737
|
feat(ui-conversation): wire assistant session forks
|
2026-07-30 21:28:17 +08:00 |
|
|
imccyu
|
7d27c92851
|
test(web): cover row fork in the real app
|
2026-07-30 21:28:16 +08:00 |
|
|
imccyu
|
36f1489398
|
fix(web): address session fork review findings
|
2026-07-30 21:28:13 +08:00 |
|
|
ZiyaZhang
|
6d416b06c5
|
fix(client): gate every full access picker
|
2026-07-30 05:48:33 -07:00 |
|
|
kingwl
|
7da7d5784d
|
Open command menu from composer plus button
|
2026-07-30 20:42:48 +08:00 |
|
|
imccyu
|
34c124585a
|
fix: test
|
2026-07-30 16:46:50 +08:00 |
|
|
imccyu
|
291fe1e823
|
test(web): refresh composer stats expected outputs
|
2026-07-30 13:15:57 +08:00 |
|
|
imccyu
|
e80d7bce17
|
test(web): refresh message action expected outputs
|
2026-07-30 11:50:12 +08:00 |
|
|
imccyu
|
2fa26cd140
|
test(web): refresh localized expected outputs
|
2026-07-30 11:39:40 +08:00 |
|
|
imccyu
|
0dbe631c3a
|
test(web): refresh browser expected outputs
|
2026-07-30 10:23:23 +08:00 |
|
 _Kerman
|
859452d807
|
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
# Conflicts:
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/error-auth.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/mid-steer.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/runtime/src/client/contract/session.ts
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-29 17:31:33 +08:00 |
|
 07akioni
|
afab428c0c
|
Merge branch 'master' into feat/agent-action
|
2026-07-29 14:21:44 +08:00 |
|