imccyu
abc0e7092b
Merge remote-tracking branch 'origin/release/dsh-0.2.2' into merge/release-dsh-0.2.2-rc.1-to-master
...
# Conflicts:
# packages/client/ui-agent-team/package.json
# packages/client/ui-brand-official/package.json
# packages/client/ui-open-in-app/package.json
# packages/client/ui-settings-web-search/package.json
# packages/experimental/agent-team-profile/package.json
# packages/team/agent-team/package.json
# packages/web/web-search-exa/package.json
# packages/web/web-search-perplexity/package.json
2026-11-04 15:59:50 +08:00
imccyu
2f97f60455
release(dsh): 0.2.2-rc.1
2026-11-04 15:50:06 +08:00
liukx0205
78167faa4f
Merge remote-tracking branch 'origin/master' into fix/web-prompt-retry
2026-11-04 15:34:17 +08:00
liukx0205
a186602dc3
Merge remote-tracking branch 'origin/master' into fix/web-prompt-retry
...
# Conflicts:
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/src/commands.ts
2026-11-04 15:29:20 +08:00
std4453
0ddca24030
Merge pull request #7569 from deepseek-harness/ux/session-menu-open-in-app
...
feat(client): 将 Open in 收进 Session 菜单并适配窄屏
2026-11-04 15:26:58 +08:00
zhc
e85a3f90be
Merge master into ux/session-menu-open-in-app
...
重新生成冲突的 ui-conversation 双语配对记录与 slot 目录;其余改动自动合并。
2026-11-04 14:31:49 +08:00
Dudu-0223
db109a62fb
Merge master into feat/subagent-catalog-names
2026-11-04 14:16:00 +08:00
zhc
39471d572d
Merge master and fix CI on shared menu branch
...
- 合并最新 master,无冲突。
- 清理 `no-unknown-casts` 基线中已失效的 `session-log-export` 测试条目。
- 会话行 ⋯ 改为共享 `contextMenu.button` 后会显示 tooltip;它在气泡尺寸
测量完成后才可见,原用例在假时钟下立即记录,结果取决于渲染时机。用例
改为等待该 tooltip 可见,快照 `more-hover` 阶段记录该 tooltip。
- 删除子菜单几何用例中对父卡片施加 `transform` 的步骤。它验证的是已删除
的逐帧移动跟踪;产品中的菜单卡片不带 transform,CSS 锚点对 transform
的跟随由浏览器决定,WebKit 在负载下不稳定。行外边距、字号、父列表滚动
与视口缩窄的真实布局验证保留。
2026-11-04 13:56:23 +08:00
Dudu-0223
bb3ac8e304
Merge master into feat/subagent-catalog-names
2026-11-04 13:51:31 +08:00
liukx0205
8706daa679
fix(web): deduplicate prompt retries after input acceptance
2026-11-04 13:37:53 +08:00
Yichen Jiang
36ed2133ff
Merge remote-tracking branch 'origin/master' into worktree/continue-generation-after-failure
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-11-04 12:50:23 +08:00
zhc
68312d2a4a
Merge master into ux/session-menu-open-in-app
...
重新生成冲突的 slot 目录与 ui-conversation 双语配对记录;其余改动自动合并。
2026-11-04 12:31:38 +08:00
zhc
45bb3da47e
Merge master and position submenus with CSS anchors
...
master 通过 #7700 将 portal 菜单改为 CSS Anchor Positioning,并删除了
`useAnchoredPosition`。本次合并让子菜单跟进同一机制:
- 子卡片以父卡片内一个不随列表滚动、与卡片同尺寸的锚点框为默认锚点,
侧开时默认在右侧、放不下时由 CSS 翻到左侧;单面板模式占据父卡片位置。
- JavaScript 只决定侧开或单面板,并提供当前行在父卡片内的偏移和子卡片
自然高度;两者都是相对尺寸,双指缩放与平移由 CSS 锚点处理。
- 锚点框绕开了 WebKit 的两个问题:锚定到自身由锚点定位的父卡片时不会
在其定位稳定后重新计算;锚定到滚动列表内的行时不计入滚动偏移。
- 删除 `useAnchoredPosition` 及其测试;`menu-submenu-position` 只保留
侧开/单面板判断,相应单测改为验证模式与锚点名。
- 解决 README、测试与 package.json 冲突,沿用 master 的 CSS 锚点说明并
补充子菜单定位描述。
2026-11-04 12:26:20 +08:00
Ziya
d70967e36b
Merge pull request #6586 from deepseek-harness/experiment/home-code-ripple
...
feat(web): play a pixel and code whale on blank home clicks
2026-11-04 04:07:26 +00:00
Dudu-0223
a6f6b98053
Merge master into feat/subagent-catalog-names
2026-11-04 12:04:15 +08:00
Yichen Jiang
9ee92455c4
Merge pull request #7788 from deepseek-harness/worktree/forge-diff-base-branch-4ffd61
...
feat(forge): add a base branch picker to local changes and restyle merge
2026-11-04 11:38:17 +08:00
Yichen Jiang
46983a077f
Merge remote-tracking branch 'origin/master' into worktree/continue-generation-after-failure
2026-11-04 11:27:00 +08:00
Yichen Jiang
e369822bc0
Merge pull request #7832 from deepseek-harness/worktree/fix-floating-panel-anchors
...
fix(web): preserve floating panel anchor alignment
2026-11-03 23:20:25 +08:00
Turtle
917aab8204
Merge pull request #7830 from deepseek-harness/turtle/render-context-injection-f1a5826b9910
...
feat(ui-chat): show context injections as tool-call rows
2026-11-03 23:13:35 +08:00
Yichen Jiang
c4ecee9173
test(web): align menu expectations and await workspace readiness
2026-11-03 22:44:39 +08:00
Yichen Jiang
0e8bfc1b9d
fix(web): preserve floating panel anchor alignment
2026-11-03 21:58:56 +08:00
Turtle and Kaige-Gao
44ad857798
feat(ui-chat): show context injections as tool-call rows
...
Ordinary Context injections were hidden from Chat. Show them as the
existing collapsed disclosure rows inside the Turn process group, and
title a group made only of Context "Injected context" instead of
"Analysis completed".
Co-authored-by: Kaige-Gao <[email protected] >
2026-11-03 21:26:17 +08:00
Yixiang Tu
dca8cfb77e
fix(client): position approval risks with CSS anchors
2026-11-03 21:05:16 +08:00
Yixiang Tu
9cfa6153ca
fix(client): dismiss approval risks on focus and foreground loss
2026-11-03 21:05:16 +08:00
Yixiang Tu
43e9de8170
fix(cua): restore existing approval button emphasis
2026-11-03 21:05:16 +08:00
Yixiang Tu
4ff169c8ad
refactor(cua): refine application control risk notice
2026-11-03 21:05:16 +08:00
Yixiang Tu
ba3c339cc7
fix(cua): dismiss pointer-focused risks and refine localized notice
2026-11-03 21:05:16 +08:00
Yixiang Tu
85da1c0f66
fix(client): remove close button from app risk hover card
2026-11-03 21:05:16 +08:00
Yixiang Tu
c03f27db21
fix(client): show formatted app risks on hover and correct approval docs
2026-11-03 21:05:16 +08:00
Yixiang Tu
fdf8f140ba
feat(cua): clarify application approval risks and session choice
2026-11-03 21:05:16 +08:00
Yichen Jiang
6f84e118b1
Merge remote-tracking branch 'origin/master' into worktree/continue-generation-after-failure
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-11-03 16:48:34 +08:00
Dudu-0223
7b2d7841dd
Merge master into subagent naming fixes
2026-11-03 15:52:55 +08:00
Yichen Jiang
a703e9e4b0
fix(forge): address review of the base branch picker
...
Identify a local review comparison by its compared ref instead of the
displayed base name. Branch records stored before this change appear in
the automatic comparison again, and comparisons that share a name, such
as a worktree start and a local branch, stay apart.
List base branch refs within maxDiffBytes, so a repository with more refs
than maxOutputBytes allows keeps a working menu, and document the
remaining limit.
Move the merge button fill toward the label color so its label reaches
4.5:1 contrast in both themes, name the automatic menu group, and drop an
unused DOM attribute.
Refs #7781
2026-11-03 15:52:36 +08:00
imccyu
36626c7dfa
Merge pull request #7700 from deepseek-harness/refactor/css-anchored-panels
...
refactor(client): position floating panels with CSS anchors
2026-11-03 15:43:31 +08:00
Yichen Jiang
00fbab4c14
Merge remote-tracking branch 'origin/master' into worktree/continue-generation-after-failure
...
# Conflicts:
# docs/persistence-schema.json
2026-11-03 15:28:52 +08:00
imccyu
f590c13c92
Merge master into worktree-sync-dsh-0.2.2-to-master-1103b
2026-11-03 15:10:23 +08:00
Stevring
82b953acc5
Merge master into refactor/css-anchored-panels
2026-11-03 14:26:17 +08:00
Yichen Jiang
2fb4ea0bec
Merge origin/master into worktree/continue-generation-after-failure
2026-11-03 14:08:46 +08:00
imccyu
c18851aa30
Merge pull request #7780 from deepseek-harness/worktree-sync-dsh-0.2.2-to-master-1103
...
release(dsh): sync release/dsh-0.2.2 back to master (#7704 )
2026-11-03 14:07:24 +08:00
winewill
ece8f7cb77
Merge pull request #7495 from deepseek-harness/feat/desktop-update-channels
...
feat(desktop): 在设置中切换更新渠道
2026-11-03 14:03:04 +08:00
Yichen Jiang
61addcbcb9
Merge remote-tracking branch 'origin/master' into worktree/forge-diff-base-branch-4ffd61
2026-11-03 13:49:51 +08:00
Dudu-0223
9f57925000
Merge remote-tracking branch 'origin/master' into feat/subagent-catalog-names
...
# Conflicts:
# docs/persistence-schema.json
# docs/tool-catalog.i18n.yaml
2026-11-03 13:49:18 +08:00
Yichen Jiang
fcc1becf11
feat(forge): choose the base branch of local changes
...
The Branch scope of the local changes view compared only with the
automatic fork point. Its header now names the checked-out branch and a
searchable base branch menu that lists the automatic fork point, then
remote-tracking and local branches; a chosen branch compares with its
merge base with HEAD. The choice lives in the view tab, a missing or
unrelated branch offers the default instead of a retry, and local Branch
review quotes name the base they were compared with.
Refs #7781
2026-11-03 13:49:13 +08:00
imccyu
1c78d475bf
release(dsh): 0.2.2-alpha.3
2026-11-03 13:37:26 +08:00
imccyu
c08621b991
Merge master into worktree-sync-dsh-0.2.2-to-master-1103
2026-11-03 13:32:45 +08:00
Stevring
0667efe813
Merge master into refactor/css-anchored-panels
2026-11-03 13:32:06 +08:00
winewill
3c46127816
Merge remote-tracking branch 'origin/master' into feat/desktop-update-channels
2026-11-03 13:20:42 +08:00
yudshj
3859913c68
feat(web): 网页搜索与获取设置页分开选择 Search 与 Fetch,Search 默认改为 DeepSeek Search API
2026-11-03 13:04:26 +08:00
imccyu
06bf7ce024
Revert "fix(settings): show saved API keys and preserve environment detection…"
...
This reverts commit 9bb49604b63bb5d50e879bcf63c9f5cb2afbd737.
2026-11-03 12:33:44 +08:00
Magolor
f07af538f8
fix(schedule): initialize stored task timing controls ( #7704 )
...
* fix(schedule): initialize stored task timing controls
* fix(schedule): preserve native editor timing on save
* fix(schedule): clarify validation and preserve calendar edits
* fix(schedule): clarify custom rule corrections
2026-11-03 12:30:08 +08:00