 Tianyi Cui
|
cff0e5d9a4
|
Merge master into codex/sandbox-policy-context
|
2026-07-31 13:45:37 +08:00 |
|
 Yichen Jiang
|
75f2489ba1
|
Merge pull request #1031 from deepseek-harness/worktree/fix-models-settings
fix(web): improve Models settings presentation and safety
|
2026-07-31 13:44:11 +08:00 |
|
|
Tianyi Cui
|
4535782742
|
Merge master into codex/sandbox-policy-context
|
2026-07-31 13:31:13 +08:00 |
|
 NI0317
|
c01b64c3c1
|
test(web): follow the Full access product label
|
2026-07-31 13:17:31 +08:00 |
|
 imccyu
|
eacd24d66a
|
Merge branch 'master' into feat/web-diff-card
|
2026-07-31 13:07:51 +08:00 |
|
|
Tianyi Cui
|
fbf28700af
|
Merge master into codex/sandbox-policy-context
# Conflicts:
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tsconfig.json
# tsconfig.host.json
|
2026-07-31 13:04:21 +08:00 |
|
 Chinesezjc
|
64c855737d
|
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
|
2026-07-31 12:50:58 +08:00 |
|
|
imccyu
|
68a99cf75c
|
Merge branch 'master' into codex/responsive-queue-panel
|
2026-07-31 12:44:53 +08:00 |
|
 Wenlu Wang
|
4e345c38a9
|
Merge branch 'master' into codex/responsive-queue-panel
|
2026-07-31 12:34:57 +08:00 |
|
|
imccyu
|
5afdb5c235
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 12:23:03 +08:00 |
|
|
Chinesezjc
|
4bcec15edd
|
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
# Conflicts:
# apps/web/tests/built-boot.snapshot.ts
# packages/client/connection/src/client/fixture.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-conversation/tests/chat-apply.spec.tsx
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/README.md
# packages/client/ui-primitives/README.zh.md
# packages/client/ui-primitives/src/index.ts
|
2026-07-31 11:56:28 +08:00 |
|
|
Yichen Jiang
|
8763491a9d
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 11:49:02 +08:00 |
|
 Ziya
|
ade8358e67
|
Merge branch 'master' into feat/gui-full-access-confirmation
|
2026-07-30 23:45:31 -04:00 |
|
|
Yichen Jiang
|
2e07da19e5
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 11:39:58 +08:00 |
|
|
Yichen Jiang
|
788b9eb986
|
fix(web): hide provider liveness badges
|
2026-07-31 11:32:10 +08:00 |
|
|
imccyu
|
aea9cf5e6c
|
test(web): carry Full access label into plan-active golden
|
2026-07-31 11:30:08 +08:00 |
|
|
Chinesezjc
|
e4cb667184
|
Merge remote-tracking branch 'origin/master' into feat/web-web-card
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 11:26:35 +08:00 |
|
|
Chinesezjc
|
5a52f33dd1
|
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 11:26:21 +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 |
|
|
Yichen Jiang
|
61edbe400f
|
Merge remote-tracking branch 'origin/master' into worktree/fix-models-settings
|
2026-07-31 11:14:25 +08:00 |
|
|
Yichen Jiang
|
311aca3663
|
fix(web): improve models settings safety and contrast
|
2026-07-31 11:14:07 +08:00 |
|
|
imccyu
|
9525cc9db2
|
Merge pull request #1005 from deepseek-harness/codex/new-task
Open command menu from composer plus button
|
2026-07-31 11:12:26 +08:00 |
|
|
kingwl
|
28d308b469
|
Merge remote-tracking branch 'origin/master' into codex/responsive-queue-panel
# Conflicts:
# packages/client/ui-conversation/src/client/queue/QueueDock.module.css
# packages/client/ui-conversation/src/client/skeleton/ConversationRoot.module.css
# packages/client/ui-conversation/src/client/skeleton/InputBar.module.css
# packages/client/ui-conversation/src/client/skeleton/TodoPanel.module.css
|
2026-07-31 11:10:08 +08:00 |
|
|
Chinesezjc
|
40b9ccff20
|
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
# Conflicts:
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
|
2026-07-31 11:07:52 +08:00 |
|
|
NI0317
|
05c4b916cb
|
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
|
2026-07-31 11:05:02 +08:00 |
|
|
NI0317
|
4e1ccebfff
|
Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
# Conflicts:
# examples/acp-agent/tests/goal-snapshots/goal-session/session.expected.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/session.jsonl
# examples/acp-agent/tests/snapshots/bash-tool-turn/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/session.jsonl
# examples/acp-agent/tests/snapshots/cancel/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/empty-response-retry/session.jsonl
# examples/acp-agent/tests/snapshots/error-finish/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/session.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/session.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/session.jsonl
# examples/acp-agent/tests/snapshots/fs-read/session.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/session.jsonl
# examples/acp-agent/tests/snapshots/fs-write/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-invalid-matcher/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-invalid-matcher/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/session.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/session.jsonl
# examples/acp-agent/tests/snapshots/lsp-definition/session.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/session.jsonl
# examples/acp-agent/tests/snapshots/packed-chunks/session.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/session.jsonl
# examples/acp-agent/tests/snapshots/pty-tools/session.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/session.jsonl
# examples/acp-agent/tests/snapshots/session-query-spill/session.jsonl
# examples/acp-agent/tests/snapshots/session-sandbox-root/session.jsonl
# examples/acp-agent/tests/snapshots/session-title-after-turn/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/acp-agent/tests/snapshots/todo-write/session.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/session.jsonl
# examples/acp-agent/tests/snapshots/web-fetch/session.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/session.1.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/stream-json.expected.jsonl
# examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/child.expected.jsonl
# examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/parent.expected.jsonl
# examples/jsonrpc-agent/tests/snapshots/persistent-tools/notifications.expected.jsonl
# examples/jsonrpc-agent/tests/snapshots/persistent-tools/session.jsonl
# packages/core/agent-loop/src/agent.ts
|
2026-07-31 11:02:45 +08:00 |
|
|
Ziya
|
7b95559f18
|
Merge branch 'master' into feat/gui-full-access-confirmation
|
2026-07-30 22:51:43 -04:00 |
|
|
Chinesezjc
|
83f3ed8b91
|
Merge remote-tracking branch 'origin/master' into feat/web-web-card
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/README.md
# packages/client/ui-primitives/README.zh.md
# packages/client/ui-primitives/src/index.ts
|
2026-07-31 10:51:09 +08:00 |
|
|
Chinesezjc
|
fa6ba79ddf
|
Merge remote-tracking branch 'origin/feat/web-presenter' into feat/web-web-card
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 10:42:43 +08:00 |
|
 ZiyaZhang
|
83d6be50aa
|
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
|
2026-07-30 19:32:51 -07:00 |
|
|
Yichen Jiang
|
11fde7bc1a
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# packages/client/ui-conversation/tests/chat-view.spec.tsx
|
2026-07-31 10:26:23 +08:00 |
|
|
imccyu
|
d6da16b7f3
|
Merge branch 'master' into codex/basic-session-search
|
2026-07-31 10:23:52 +08:00 |
|
|
imccyu
|
ce57438ac0
|
Merge branch 'master' into codex/new-task
|
2026-07-31 10:23:14 +08:00 |
|
|
Yichen Jiang
|
d3c6638b6d
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/chat-view.spec.tsx
|
2026-07-31 10:19:14 +08:00 |
|
|
imccyu
|
b10bcf2d44
|
test(web): re-record the hero golden for the localized search placeholder
|
2026-07-31 04:56:51 +08:00 |
|
|
imccyu
|
5ccebb4741
|
test(web): align the search e2e anchor with the localized placeholder
|
2026-07-31 04:46:22 +08:00 |
|
|
imccyu
|
59ce4086ae
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
# packages/client/ui-workspace/src/client/index.ts
# packages/client/ui-workspace/src/client/rows/Rows.tsx
# packages/client/ui-workspace/src/client/tree.ts
# packages/client/ui-workspace/tests/apply.spec.ts
# packages/client/ui-workspace/tests/rows.spec.tsx
# packages/client/ui-workspace/tests/tree.spec.ts
# packages/client/ui-workspace/tests/workspace-browser.spec.tsx
|
2026-07-31 04:37:08 +08:00 |
|
|
Chinesezjc
|
22d8fa788b
|
Merge remote-tracking branch 'origin/master' into feat/web-diff-card
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/GenericToolCard.tsx
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
# packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/src/index.ts
|
2026-07-31 04:22:57 +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
|
588e4951df
|
test(web): align full-access scenario anchors with locale rollout
|
2026-07-31 03:36:42 +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
|
4957c01264
|
test(web): refresh goldens for the unified tool-row expand after the locale merge
|
2026-07-31 03:03:34 +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
|
7730ffad4e
|
test(web): refresh plan-review and seeded-history goldens after master merge
|
2026-07-31 02:45:22 +08:00 |
|
|
imccyu
|
72a7307826
|
chore: regenerate module graph and refresh composer goldens after master merge
|
2026-07-31 02:28:43 +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
|
119cc05577
|
fix: docs/static
|
2026-07-31 02:13:53 +08:00 |
|
|
imccyu
|
d752405ad1
|
feat: locale update all
|
2026-07-31 02:13:53 +08:00 |
|
|
imccyu
|
1e10966ef6
|
wip
fix: docs
|
2026-07-31 02:13:53 +08:00 |
|
|
imccyu
|
2e034bbbd3
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# apps/cli/README.i18n.yaml
# docs/module-graph.md
# packages/client/connection/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
|
2026-07-31 02:02:47 +08:00 |
|