 Tianyi Cui
|
ba66ade9f4
|
Merge latest master into status bar token metrics
|
2026-07-31 11:36:11 +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 |
|
 NI0317
|
c955c9adb1
|
fix(web): align the credential onboarding page
|
2026-07-31 11:27:01 +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 |
|
 _Kerman
|
37a127af0c
|
Merge remote-tracking branch 'github/master' into xtr/trajectory-timeline-polish
|
2026-07-31 11:17:32 +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 |
|
|
_Kerman
|
db00677fd2
|
Merge remote-tracking branch 'github/master' into xtr/trajectory-timeline-polish
|
2026-07-31 11:12:51 +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 |
|
|
_Kerman
|
1265920adc
|
fix(web): source-alias schema form in frontend build
|
2026-07-31 11:12:18 +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 |
|
|
NI0317
|
f7355e4e8e
|
Merge latest origin/master into feature/tui-first-run-welcome
# Conflicts:
# apps/cli/README.i18n.yaml
|
2026-07-31 10:58:48 +08:00 |
|
|
NI0317
|
436e557275
|
Merge origin/master into feature/tui-first-run-welcome
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# apps/cli/src/tui.ts
# apps/cli/tests/tui-keyless-smoke.e2e.ts
|
2026-07-31 10:58:00 +08:00 |
|
 Hypatia May
|
3a99cf7446
|
Merge current master into status bar projection
|
2026-07-31 10:56:34 +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 |
|
|
imccyu
|
c0733ba46b
|
Merge branch 'master' into fix/nodeboot-dep
|
2026-07-31 10:34:07 +08:00 |
|
 ZiyaZhang
|
83d6be50aa
|
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
|
2026-07-30 19:32:51 -07:00 |
|
|
NI0317
|
fb80732e7d
|
Merge updated DeepSeek onboarding base
# Conflicts:
# .agents/notes/implemented/feature/2026-07-30-deepseek-onboarding-credential-setup.i18n.yaml
# .agents/notes/implemented/feature/2026-07-30-deepseek-onboarding-credential-setup.md
# .agents/notes/implemented/feature/2026-07-30-deepseek-onboarding-credential-setup.zh.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/DeepSeekOnboardingDialog.module.css
# packages/client/ui-models/src/client/DeepSeekOnboardingDialog.tsx
# packages/client/ui-models/tests/onboarding-dialog.spec.tsx
|
2026-07-31 10:29:20 +08: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 |
|
|
NI0317
|
cd23acb366
|
test(tui): force-stop resumed PTY acceptance
|
2026-07-31 10:25:02 +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 |
|
|
_Kerman
|
7a463dbe44
|
Merge branch 'master' of https://github.com/deepseek-harness/deepseek-harness into xtr/react-loop-simplification
# Conflicts:
# .agents/notes/implemented/feature/2026-07-17-dedicated-full-screen-tui-front-door.i18n.yaml
# docs/architecture.i18n.yaml
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/core.md
# docs/core-data-structures/core.zh.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/llm-streaming.md
# docs/core-data-structures/llm-streaming.zh.md
# docs/core-data-structures/session.i18n.yaml
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.i18n.yaml
# packages/core/session/README.i18n.yaml
# packages/core/session/src/types.ts
# packages/llm/llm/README.i18n.yaml
# packages/llm/llm/README.md
# packages/llm/llm/README.zh.md
# packages/llm/llm/src/index.ts
# packages/llm/llm/tests/service.spec.ts
# packages/sdk/sdk-client/README.i18n.yaml
# packages/sdk/sdk-protocol/README.i18n.yaml
# packages/sdk/sdk-protocol/README.md
# packages/sdk/sdk-protocol/README.zh.md
# packages/subagent/subagent-dsh-sdk/README.i18n.yaml
# packages/ui/jsonrpc/README.i18n.yaml
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/README.zh.md
# packages/ui/tui/src/index.ts
# python/sdk/README.i18n.yaml
# scripts/gen-cordis-catalog.ts
|
2026-07-31 10:16:14 +08:00 |
|
|
Hypatia May
|
afe8d49691
|
Merge finalized manual compaction parent
|
2026-07-31 10:11:54 +08:00 |
|
|
Hypatia May
|
01e64c6350
|
Merge finalized Web transcript parent
|
2026-07-31 09:46:32 +08:00 |
|
|
Hypatia May
|
ff8c5600f4
|
Merge pinned master into status bar projection
|
2026-07-31 09:28:52 +08:00 |
|
|
Hypatia May
|
074f0e4393
|
Merge pinned master into Web transcript
|
2026-07-31 09:18:45 +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
|
296cb1c35f
|
fix: app-boot report plugin error detail
|
2026-07-31 03:02:45 +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 |
|