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
Turtle and imccyu
4731be7515
Merge origin/master into turtle/fork-name-suffix-5f3435925211
...
Co-authored-by: imccyu <[email protected]
2026-11-04 14:16:25 +08:00
liukx0205
8706daa679
fix(web): deduplicate prompt retries after input acceptance
2026-11-04 13:37:53 +08:00
Yichen Jiang
2fb4ea0bec
Merge origin/master into worktree/continue-generation-after-failure
2026-11-03 14:08:46 +08:00
imccyu
ef5f28d0fb
Merge master into worktree-sync-dsh-0.2.2-to-master
2026-11-03 11:47:40 +08:00
imccyu
d3f7b8abe7
Merge pull request #7701 from deepseek-harness/fix/empty-session-sidebar-0.2.2
...
[0.2.2] fix(session-projection): compute exactly the requested projections for hot session summaries
2026-11-02 17:05:09 +08:00
Yichen Jiang
fa9f77cc42
Merge remote-tracking branch 'origin/master' into worktree/continue-generation-after-failure
...
# Conflicts:
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# docs/persistence-catalog.i18n.yaml
# docs/persistence-catalog.md
# docs/persistence-catalog.zh.md
# docs/persistence-changes/historical-formats/README.i18n.yaml
# docs/persistence-changes/historical-formats/README.md
# docs/persistence-changes/historical-formats/README.zh.md
# docs/persistence-schema.json
# packages/api/session-controller/src/types.ts
# packages/api/session-controller/tests/session-projections.host.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/package.json
2026-11-02 16:02:18 +08:00
Yichen Jiang
818e8eced2
refactor(web): use empty retry user messages without loop changes
2026-11-02 15:58:09 +08:00
Dudu-0223
4514b99d9c
Merge master into feat/subagent-names
2026-10-29 17:43:46 +08:00
Turtle and imccyu
8818fdd2e0
docs(session-controller): document fork title limits
...
Co-authored-by: imccyu <[email protected]
2026-10-28 15:35:43 +08:00
Turtle and imccyu
3be7d56c6d
fix(session-controller): give repeated forks distinct titles
...
Fixes #7471
Co-authored-by: imccyu <[email protected]
2026-10-28 15:22:54 +08:00
Yichen Jiang
2e0c73a895
refactor(agent): record continuation as retry control input
2026-10-27 12:07:24 +08:00
Yichen Jiang
4a4aabaa57
fix(core): align empty continuation checks and generated references
2026-10-26 22:16:24 +08:00
Yichen Jiang
d8254627fe
feat(core): continue failed turns through empty prompt input
2026-10-26 22:12:13 +08:00
Yichen Jiang
b0e41f74ad
Merge remote-tracking branch 'origin/master' into worktree/composer-host-confirmed-echo
...
# Conflicts:
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
2026-10-26 13:29:33 +08:00
imccyu
7c7b021766
docs(session): document events, deprecated page and activation order
...
Sync the Session README, implementation notes and follow upgrade guide,
then regenerate the API, subsystem, persistence and event-graph catalogs.
2026-10-25 18:14:32 +08:00
CreatixChu
7bc30c4cba
fix(attachments): 复用完整图片引用，取消 Session 历史扫描 ( #7021 )
...
* test(api): measure historical image read costs
* fix(test): resolve image benchmark paths from its config
* fix(attachments): read stored images without scanning sessions
* test(attachments): complete by-id fixtures and access assertions
* fix(docs): implement image-id read on catalog fixture
* docs(attachments): refresh generated read contracts
* test(web): verify stored images across history and forks
* docs(api): clarify image read metadata and permission scope
* test(api): type benchmark instrumentation without unsafe returns
* test(api): retire unknown-cast allowances with removed history fixtures
* test(attachments): isolate browser cases and document store-wide access
* test(web): intercept the by-id thumbnail read path
* docs(perf): run generated diagnostic from its owning package
* refactor(attachments): reuse reference reads for conversation images
* docs(api): refresh complete image reference client contract
* test(ui-chat): assert complete image reference forwarding
* test(perf): measure image reads against current Session observations
2026-10-25 09:40:53 +00:00
Yichen Jiang
3764b60205
Merge commit '3dd445fe163' into worktree/composer-host-confirmed-echo
...
The session-controller README pairing is recorded again for the merged
sections.
2026-10-24 21:39:51 +08:00
Dudu-0223
f09648ddca
Merge published subagent activation ownership changes
2026-10-23 18:28:46 +08:00
Dudu-0223
00a2e76b87
Merge master and reconcile translation records
2026-10-23 18:19:07 +08:00
imccyu
b2b3bf4568
fix(typert): reject ambiguous and multiple default resource identities
2026-10-23 16:13:38 +08:00
Dudu-0223
b3d4933f39
refactor(subagent): own live lineage outside core agent registry
2026-10-23 16:07:11 +08:00
Dudu-0223
3dde36b5bb
Merge master while preserving subagent lifecycle changes
2026-10-23 15:41:00 +08:00
Dudu-0223
ad7c75c798
Bind subagent providers and preserve archived ancestor checks
2026-10-23 15:10:11 +08:00
Dudu-0223
b096659245
fix(session): make ordinary forks independent of source lineage
2026-10-23 14:48:07 +08:00
Dudu-0223
e914c285d2
Merge master into subagent refactor
2026-10-23 14:45:13 +08:00
Yichen Jiang
89538fb115
Merge remote-tracking branch 'origin/master' into worktree/composer-host-confirmed-echo
...
- The composer's primary button keeps master's rule that hides a denied
action and draws the sending state inside it; a sending prompt stays
interruptible through master's stopAction.
- The ui-conversation README pairing is recorded again for the merged
sections.
2026-10-23 14:31:30 +08:00
Dudu-0223
ea009821d6
Simplify subagent user controls and authorize target sessions
2026-10-22 17:06:13 +08:00
Turtle
b908e13271
Merge remote-tracking branch 'origin/master' into turtle/image-cache-stale-0a243f674e12
...
# Conflicts:
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/README.md
# packages/api/session-controller/README.zh.md
# packages/client/ui-primitives/README.i18n.yaml
2026-10-22 14:57:42 +08:00
Dudu-0223
16ece34568
Merge master into subagent tree branch
2026-10-22 13:33:16 +08:00
Yichen Jiang
da864e3377
Merge remote-tracking branch 'origin/master' into stack/pr-6426
2026-10-22 10:30:26 +08:00
Yichen Jiang
6dafa66dc6
docs(attachment): state the relaxed default image limits
...
The default per-image limit is 50 MiB and the default per-side limit is
65,535 pixels, but the admission summaries in the attachment subsystem
page and the attachment-local README still named 20 MiB and 8192 pixels.
The session-controller note on the /api/file byte limit and the tool-fs
note on read_image source caps also named the old 20 MiB maxImageBytes
default.
2026-10-21 18:02:38 +08:00
Turtle
16cf3316e6
Merge remote-tracking branch 'origin/master' into turtle/image-cache-stale-0a243f674e12
...
# Conflicts:
# packages/api/session-controller/README.i18n.yaml
# packages/client/ui-primitives/README.i18n.yaml
2026-10-21 17:58:20 +08:00
Yichen Jiang
faf62f4c1a
Merge branch 'worktree/composer-image-preupload' into worktree/pr-6426-review-970262
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/input/facade.ts
# packages/client/ui-conversation/src/client/input/hub.ts
2026-10-21 15:15:46 +08:00
Yichen Jiang
1b608982cc
Merge remote-tracking branch 'origin/master' into worktree/composer-image-preupload
...
# Conflicts:
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# docs/persistence-catalog.i18n.yaml
# docs/persistence-catalog.md
# docs/persistence-catalog.zh.md
# docs/persistence-schema.json
# packages/client/ui-conversation/README.i18n.yaml
2026-10-21 15:02:15 +08:00
lsdsjy and lsdsjy
0e49f443dd
feat(ui-conversation,ui-chat): 基于 user-text 支持富文本引用与草稿恢复 ( #3206 )
...
* feat(ui-chat,ui-conversation): 通过通用文本交互支持原文引用
* refactor(message-quotes): 插件化引用交互与文本扫描豁免
* test(message-quotes): 补齐插件装配预期与交互分发覆盖
* refactor(ui-conversation): 移除引用删除文案的语言切换刷新
* refactor(message-quotes): 移除引用扫描豁免并收窄文本交互接口
* fix(ui-chat): 修复引用浮层的滚动遮挡与恢复
* fix(ui-chat): 对齐 master 的聊天流注入与界面快照
* test(message-quotes): 补齐 Host 入口覆盖并固定子会话回放时序
* refactor(message-quotes): 清理文本依赖特例并修正引用按钮
* fix(ui-primitives): 让引用原文弹层按内容收缩
* fix(ui-primitives): 修复相邻引用悬停弹层重叠与误切换
* fix(message-quotes): 为引用悬停样式限定设备能力
---------
Co-authored-by: lsdsjy <[email protected]
2026-10-21 14:41:41 +08:00
Yichen Jiang
114ab6395b
Merge branch 'worktree/composer-image-preupload' into worktree/composer-host-confirmed-echo
...
Brings in master a8d675ecc92, which reverts the agent controller of #6418 ,
together with the composer's image upload on add.
The agent-controller message delivery Agent Note follows master's deletion.
The ui-conversation README keeps the read-only sending paragraph and takes
the image upload sentences. Service orchestration keeps both new sendSession
cases, and the refused-send reference case takes master's newSession
submission fact. README pairings are recorded again.
2026-10-21 14:05:09 +08:00
Yichen Jiang
9be99a0e28
feat(web): upload composer images when they are added
...
An ordinary Session's composer now uploads each image draft through the
background upload queue as soon as it is added. The raw upload route stages
the body as a prompt image when the request names its media type: the Host
reads at most the per-image byte limit, then validates, normalizes, and
stores the image as prompt admission would. The prompt cites the receipt in
a file part; prompt admission resolves it to the stored image, applies the
image-input check, and counts stored images toward maxImagesPerMessage.
Send waits for every image receipt, and a failed image upload turns its
thumbnail into a retry control. Commands and subagent continuations keep
encoding images inline.
2026-10-21 13:50:19 +08:00
_Kerman
ba50aec4de
fix(session): preserve automatic reasoning effort on selection
2026-10-20 21:09:29 +08:00
_Kerman
a9c006f9c3
refactor(agent): own model selection on each agent
2026-10-20 21:09:09 +08:00
_Kerman
639602e63a
Merge origin/master into xtr/session-model-selection
2026-10-20 20:57:11 +08:00
Turtle
aa8bdfc79e
Revert "feat(agent): admit Web prompts through the agent controller"
2026-10-20 19:09:02 +08:00
Turtle
450e81bbf3
Merge remote-tracking branch 'origin/master' into turtle/image-cache-stale-0a243f674e12
...
# Conflicts:
# packages/client/ui-primitives/README.i18n.yaml
# packages/client/ui-primitives/README.md
# packages/client/ui-primitives/README.zh.md
# packages/client/ui-primitives/tests/markdown-path-images.client.spec.tsx
2026-10-20 18:00:57 +08:00
_Kerman
8b79a1ddcc
Merge origin/master into xtr/session-model-selection
2026-10-20 17:22:59 +08:00
Yichen Jiang
317e56d108
fix(web): accept a prompt when its Inbox row arrives before the receipt
...
The Host's Inbox projection can reach the client before the prompt receipt.
Until the receipt published the echo, QueueDock showed the message as a
queued row, and in "On next message" mode the conversation followed the
grown tail and then folded back.
An Inbox row carrying the request id proves that the Host accepted the
prompt. The Session now publishes the echo and leaves the blank layout at
whichever of the receipt or the row arrives first, and calls the new
onAccept callback in that update. The composer settles inside that callback,
before the echo renders, so the fold starts from the shrunk composer instead
of depending on microtask order.
2026-10-20 15:51:53 +08:00
Dudu-0223
3331b91a52
Merge origin/master into refactor/agent-team-named-subagents
2026-10-20 15:10:31 +08:00
Yichen Jiang
eb105d3471
Merge branch 'refs/heads/worktree/session-agent-controller-refactor-ff892d' into worktree/composer-host-confirmed-echo
...
# Conflicts:
# packages/api/session-controller/README.i18n.yaml
2026-10-19 22:40:19 +08:00
Yichen Jiang
1d51715aca
Merge remote-tracking branch 'origin/master' into worktree/session-agent-controller-refactor-ff892d
...
# Conflicts:
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# docs/module-graph.md
# docs/module-graph.zh.md
# docs/persistence-catalog.i18n.yaml
# docs/persistence-catalog.md
# docs/persistence-catalog.zh.md
# docs/persistence-schema.json
# packages/api/session-controller/README.i18n.yaml
# packages/api/session-controller/tests/commands-upload-file.host.spec.ts
# scripts/gen-cordis-catalog.ts
2026-10-19 22:25:55 +08:00
Yichen Jiang
ed99af1272
Merge remote-tracking branch 'origin/worktree/session-agent-controller-refactor-ff892d' into worktree/composer-host-confirmed-echo
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-10-17-agent-controller-message-delivery.i18n.yaml
# packages/api/session-controller/README.i18n.yaml
2026-10-19 17:00:01 +08:00
Yichen Jiang
a472820428
fix(agent): wait for deliveries on disposal and keep image prompts in order
...
The Agent controller now finishes disposal only after every delivery it
stopped has settled, and a sender that cancels stops waiting at once, also
while its message waits behind a held one; the message keeps its place and
is dropped at its turn.
An image prompt takes the Session's image admission turn when its
preparation starts, in the Agent's delivery order, and keeps it until the
prompt settles. Image and text prompts therefore enter the inbox in arrival
order, and a model selection waits only for the image prompt being
admitted, not for one still queued.
The core page documents the delivery types, and the architecture overview
lists the controller and its admission event.
2026-10-19 16:58:59 +08:00
liukx0205