Commit Graph

5379 Commits

Author SHA1 Message Date
Tianyi Cui
afb05b4049 fix(settings-local): never steal writer locks 2026-07-31 01:27:46 +08:00
Tianyi Cui
f9f8148e79 refactor(credentials,llm): remove speculative mutation and route lifecycle 2026-07-31 01:27:46 +08:00
imccyu
5d29a8aff3 Merge remote-tracking branch 'origin/master' into mergebot/pr1008
# Conflicts:
#	examples/web-cordis/cordis.yml
#	packages/client/ui-conversation/src/client/apply.ts
#	packages/client/ui-conversation/src/client/chat/ChatView.tsx
#	packages/client/ui-conversation/src/client/chat/MessageItem.tsx
#	packages/client/ui-conversation/src/client/chat/ToolRow.module.css
#	packages/client/ui-conversation/src/client/chat/ToolRow.tsx
#	packages/client/ui-conversation/src/client/contract/slots.ts
#	packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
#	packages/client/ui-conversation/tests/chat-view.spec.tsx
2026-07-31 01:16:34 +08:00
Yichen Jiang
aa888d1c4a Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config 2026-07-31 01:10:16 +08:00
Yichen Jiang
c71af0f3bb Merge latest master into worktree-llm-web-config 2026-07-31 01:09:50 +08:00
imccyu
b6917b6e62 Merge pull request #981 from deepseek-harness/worktree/command-row-copy
feat(ui): drop the slash and the argument echo from the command row
2026-07-31 01:09:06 +08:00
Yichen Jiang
11ffab7400 Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config 2026-07-31 01:06:55 +08:00
Yichen Jiang
a37a90548a Merge latest master into worktree-llm-web-config 2026-07-31 01:06:28 +08:00
Tianyi Cui
26ef1b7e6c Merge commit '557cff8871e86a7a9be85c2ee2d8225db8b439fe' into worktree/pr977-merge-20260731 2026-07-31 00:52:43 +08:00
imccyu
a3ddc90df6 Merge branch 'master' into worktree/command-row-copy 2026-07-31 00:50:47 +08:00
Yichen Jiang
15636fbb8e fix(web): skip unavailable DeepSeek onboarding modal 2026-07-31 00:44:24 +08:00
imccyu
5099f72ea0 Merge branch 'master' into worktree/command-row-copy 2026-07-31 00:41:04 +08:00
Hypatia May
f3963686bd Merge final Web parent into manual compact 2026-07-31 00:38:21 +08:00
NI0317
99aff882dc Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context
# Conflicts:
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	examples/acp-agent/tests/snapshots/web-fetch/session.jsonl
2026-07-31 00:33:13 +08:00
Hypatia May
0378a72431 Align trajectory bundle test with session history 2026-07-31 00:33:03 +08:00
Yichen Jiang
c580b1b634 Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config 2026-07-31 00:32:59 +08:00
NI0317
bc69648f03 Merge updated DeepSeek onboarding base
# Conflicts:
#	packages/host/apiproxy/README.i18n.yaml
2026-07-31 00:32:40 +08:00
Tianyi Cui
dc0c52bb03 Merge commit 'aab64371402d93293bde384139aaa607906928a8' into worktree/pr977-merge-20260731 2026-07-31 00:32:10 +08:00
Yichen Jiang
e8c550d0e5 Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config 2026-07-31 00:31:42 +08:00
Yichen Jiang
f64026d7e3 Merge latest master into worktree-llm-dynamic-config 2026-07-31 00:31:06 +08:00
NI0317
d7d567b7c6 Merge origin/master into feature/tui-first-run-welcome 2026-07-31 00:29:05 +08:00
NI0317
75a0366a52 feat(web): present onboarding as a continuous page 2026-07-31 00:28:17 +08:00
ZiyaZhang
4c5922edad Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation 2026-07-30 09:28:09 -07:00
Hypatia May
ceb37f3377 Merge final master into Web transcript 2026-07-31 00:27:16 +08:00
Yichen Jiang
52c997d01d Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config 2026-07-31 00:22:45 +08:00
imccyu
e4e78e7a31 Merge remote-tracking branch 'origin/master' into mergebot/pr981 2026-07-31 00:22:36 +08:00
Yichen Jiang
ce3a75ecca Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config 2026-07-31 00:21:49 +08:00
Yichen Jiang
564f04e2e2 Merge latest master into worktree-llm-dynamic-config 2026-07-31 00:20:57 +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
Hypatia May
be44f073e1 Fix invariant readiness after CI sync 2026-07-31 00:20:18 +08:00
Tianyi Cui
286a287809 Merge remote-tracking branch 'origin/master' into worktree/pr975-retarget-20260730 2026-07-31 00:14:42 +08:00
NI0317
db24140dad Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context 2026-07-31 00:10:48 +08:00
Wenlu Wang
edefdd96b9 Merge remote-tracking branch 'origin/master' into codex/new-task 2026-07-31 00:10:46 +08:00
Hypatia May
25ad9015e3 Merge final CI coverage parent into manual compact 2026-07-31 00:09:28 +08:00
Yichen Jiang
39072f8c58 Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config 2026-07-31 00:07:11 +08:00
Yichen Jiang
307fea8ae9 Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config 2026-07-31 00:06:29 +08:00
imccyu
95242698e0 Merge branch 'master' into worktree/command-row-copy 2026-07-31 00:06:04 +08:00
imccyu
bf11016bc1 Merge remote-tracking branch 'origin/master' into worktree/approval-panel-max-height 2026-07-31 00:05:48 +08:00
Yichen Jiang
1ff8bb3422 Merge latest master into worktree-llm-dynamic-config 2026-07-31 00:05:13 +08:00
Tianyi Cui
7353fc2593 Merge remote-tracking branch 'origin/master' into worktree/pr975-retarget-20260730 2026-07-31 00:05:08 +08:00
Tianyi Cui
8eb743a93b Merge remote-tracking branch 'origin/master' into worktree/pr975-retarget-20260730 2026-07-30 23:55:45 +08:00
imccyu
c6c0f5de6a Merge branch 'master' into worktree/approval-panel-max-height 2026-07-30 23:49:19 +08:00
Chinesezjc
c14948c531 Merge remote-tracking branch 'origin/master' into feat/web-diff-card 2026-07-30 23:48:57 +08:00
imccyu
7c086e40be Merge branch 'master' into worktree/plan-review-layout 2026-07-30 23:48:19 +08:00
NI0317
e1c09e6620 Merge remote-tracking branch 'origin/master' into codex/sandbox-policy-context 2026-07-30 23:46:12 +08:00
imccyu
5c4398c96c Merge branch 'master' into worktree/command-row-copy 2026-07-30 23:45:49 +08:00
imccyu
57845e02ee Merge branch 'master' into xtr/trajectory-timeline-click-focus 2026-07-30 23:44:32 +08:00
Hypatia May
cc91724157 Fix invariant startup gate after CI sync 2026-07-30 23:43:53 +08:00
NI0317
f9adc5a6a6 test(subagent): assert inherited runtime context 2026-07-30 23:42:36 +08:00
Yichen Jiang
b05b0a80fd Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config 2026-07-30 23:33:14 +08:00