 Yichen Jiang
|
f64026d7e3
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-31 00:31:06 +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 |
|
|
Tianyi Cui
|
286a287809
|
Merge remote-tracking branch 'origin/master' into worktree/pr975-retarget-20260730
|
2026-07-31 00:14:42 +08:00 |
|
|
Wenlu Wang
|
edefdd96b9
|
Merge remote-tracking branch 'origin/master' into codex/new-task
|
2026-07-31 00:10:46 +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 |
|
|
Yichen Jiang
|
fe59dd3530
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
# Conflicts:
# apps/web/tests/scaffold.ts
|
2026-07-31 00:01:28 +08:00 |
|
|
imccyu
|
f332ebab16
|
Merge branch 'master' into worktree/approval-panel-max-height
|
2026-07-30 23:57:47 +08:00 |
|
|
imccyu
|
236fd794f9
|
Merge branch 'master' into worktree/plan-review-layout
|
2026-07-30 23:57:20 +08:00 |
|
|
Yichen Jiang
|
86ae2b70d5
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
|
2026-07-30 23:57:01 +08:00 |
|
|
Yichen Jiang
|
2a9a5ff412
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 23:55:50 +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
|
6842a2826f
|
Merge branch 'master' into worktree/command-row-copy
|
2026-07-30 23:52:49 +08:00 |
|
|
imccyu
|
c6c0f5de6a
|
Merge branch 'master' into worktree/approval-panel-max-height
|
2026-07-30 23:49:19 +08:00 |
|
|
imccyu
|
7c086e40be
|
Merge branch 'master' into worktree/plan-review-layout
|
2026-07-30 23:48:19 +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 |
|
|
Tianyi Cui
|
7cc784388b
|
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
|
2026-07-30 23:40:25 +08:00 |
|
|
imccyu
|
493c49aeab
|
Merge pull request #1012 from deepseek-harness/fix/tui-prompt-source-resolution
fix(cli): resolve @deepseek-ai/dsh-tui/prompt in the source plane
|
2026-07-30 23:38:13 +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 |
|
|
Yichen Jiang
|
8c0d626cd5
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
|
2026-07-30 23:32:31 +08:00 |
|
|
Tianyi Cui
|
284ec8095e
|
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
|
2026-07-30 23:29:15 +08:00 |
|
|
Yichen Jiang
|
9ebf7424f7
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 23:28:58 +08:00 |
|
|
Tianyi Cui
|
38a7c823d7
|
Merge branch 'master' into feature/directory-listing-tool
|
2026-07-30 23:17:12 +08:00 |
|
|
imccyu
|
da9f02221e
|
Merge remote-tracking branch 'origin/master' into worktree-forkweb
|
2026-07-30 22:53:07 +08:00 |
|
|
Tianyi Cui
|
233486691f
|
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
|
2026-07-30 22:42:42 +08:00 |
|
|
kingwl
|
1986de9ac1
|
fix(web): show plan status only while active
|
2026-07-30 22:42:25 +08:00 |
|
|
Tianyi Cui
|
16a287d726
|
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
|
2026-07-30 22:41:07 +08:00 |
|
|
Yichen Jiang
|
55ae4751b7
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-30 22:21:05 +08:00 |
|
|
Tianyi Cui
|
9a0ee6fbfe
|
Merge branch 'master' into worktree/deepseek-max-tokens-defaults
|
2026-07-30 22:20:47 +08:00 |
|
|
Yichen Jiang
|
015b065e9d
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
# Conflicts:
# apps/web/tests/scaffold.ts
|
2026-07-30 22:19:53 +08:00 |
|
|
Tianyi Cui
|
8f275cbf5a
|
Merge branch 'master' into xtr/trajectory-timeline-click-focus
|
2026-07-30 22:19:42 +08:00 |
|
|
Tianyi Cui
|
dc5f270ae2
|
Merge branch 'master' into codex/queue-collapse
|
2026-07-30 22:18:44 +08:00 |
|
|
Yichen Jiang
|
80c36ff0d3
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-30 22:18:16 +08:00 |
|
|
Tianyi Cui
|
95293e58b6
|
Merge remote-tracking branch 'origin/master' into worktree/fix-macos-web-replay
|
2026-07-30 22:14:28 +08:00 |
|
|
Tianyi Cui
|
b5f5a01dcb
|
Merge remote-tracking branch 'origin/master' into worktree/pr798-retarget-config-20260730
|
2026-07-30 22:14:08 +08:00 |
|
|
imccyu
|
f2bbc0f453
|
Merge branch 'master' into worktree-forkweb
|
2026-07-30 22:12:50 +08:00 |
|
|
creatixchu
|
1102cfc1f3
|
Merge remote-tracking branch 'origin/master' into worktree/plan-review-layout
|
2026-07-30 22:10:56 +08:00 |
|
|
Tianyi Cui
|
dea8f31273
|
Merge branch 'master' into worktree/fix-macos-web-replay
# Conflicts:
# .agents/notes/implemented/testing/2026-07-24-web-gui-browser-e2e-lane.i18n.yaml
|
2026-07-30 22:00:50 +08:00 |
|
|
Chinesezjc
|
ec0d3c2359
|
Merge remote-tracking branch 'origin/master' into feat/web-presenter
|
2026-07-30 21:55:37 +08:00 |
|
|
Yichen Jiang
|
02b8529405
|
Merge origin/master into worktree/deepseek-max-tokens-defaults
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/session.i18n.yaml
# packages/core/session/README.i18n.yaml
|
2026-07-30 21:55:07 +08:00 |
|
|
imccyu
|
6f2e8fb6aa
|
Merge branch 'master' into worktree-forkweb
|
2026-07-30 21:53:03 +08:00 |
|
|
Yichen Jiang
|
e5d7fa4cef
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-30 21:52:25 +08:00 |
|