Ziya
c92954d930
Merge branch 'master' into feat/produced-files-folder
2026-08-11 17:10:25 +08:00
Ziya
6e573475ec
Merge branch 'master' into feat/produced-files-folder
2026-08-11 17:02:30 +08:00
Tianyi Cui
4d6dc77a1f
Merge remote-tracking branch 'origin/master' into worktree/remove-sdk-project-toolchain
2026-08-11 16:54:34 +08:00
ZiyaZhang
bb9d5db361
fix(ci): refresh merged doc pairings
2026-08-11 01:06:47 -07:00
Tianyi Cui
454e06c8c1
Merge origin/master into worktree/remove-sdk-project-toolchain
...
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-10-single-file-executable-sdk-runtime-distribution.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-10-single-file-executable-sdk-runtime-distribution.md
# .agents/notes/implemented/feature/2026-07-21-continuable-background-subagents.i18n.yaml
# .agents/notes/implemented/feature/2026-07-21-continuable-background-subagents.md
# .agents/notes/implemented/feature/2026-07-21-continuable-background-subagents.zh.md
# .agents/notes/proposed/architecture/2026-07-15-sdk-project-editing-architecture.i18n.yaml
# .agents/notes/proposed/architecture/2026-07-15-sdk-project-editing-architecture.md
# .agents/notes/proposed/feature/2026-07-14-sdk-developer-projects.i18n.yaml
# .agents/notes/proposed/feature/2026-07-14-sdk-developer-projects.md
# .agents/notes/proposed/feature/2026-07-14-sdk-developer-projects.zh.md
# packages/README.i18n.yaml
# packages/README.md
# packages/scaffold/create-sdk/README.md
# packages/scaffold/create-sdk/src/args.ts
# packages/scaffold/scripts/src/args.ts
# packages/sdk/README.i18n.yaml
# scripts/verify-package-readme-model-experience.ts
2026-08-11 15:56:06 +08:00
Ziya
21a23db789
Merge branch 'master' into feat/produced-files-folder
2026-08-11 15:43:31 +08:00
imccyu
f0a6c25291
fix(client): apply theme before plugin loading
2026-08-11 15:35:32 +08:00
Turtle
5d591e55c1
Merge pull request #610 from deepseek-harness/codex/replace-surface-terminology
...
Replace overloaded surface terminology
2026-08-11 15:34:34 +08:00
Yichen Jiang
9c06f682c4
Merge pull request #2207 from deepseek-harness/worktree/custom-provider-edit-parity-f8c160
...
fix(web): 自定义提供方的显示名称与 API 协议可编辑
2026-08-11 15:33:50 +08:00
Tianyi Cui
c1590faac7
Merge origin/master into worktree/remove-sdk-project-toolchain
2026-08-11 15:23:42 +08:00
Turtle
096586886a
fix(review): address terminology feedback
2026-08-11 15:23:05 +08:00
Turtle
0c708cb10d
refactor: replace overloaded surface terminology
2026-08-11 15:23:05 +08:00
Yichen Jiang
63a294fa1b
Merge remote-tracking branch 'origin/master' into worktree/custom-provider-edit-parity-f8c160
2026-08-11 15:16:23 +08:00
Tianyi Cui
5f947e1d94
Merge origin/master into worktree/remove-sdk-project-toolchain
...
# Conflicts:
# THIRD_PARTY_NOTICES.md
2026-08-11 15:08:18 +08:00
Hypatia May
6e94bfd366
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
2026-08-11 14:59:18 +08:00
Hypatia May
9f4159d0be
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
2026-08-11 14:59:00 +08:00
Hypatia May
3f9c7077f9
Merge commit '5e1b3dd6536cbf4796164e7676e13c68300bb52d' into feat/subagent-report-semantics
2026-08-11 14:58:58 +08:00
Hypatia May
6a604aaa85
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
2026-08-11 14:53:11 +08:00
Hypatia May
ef8637f864
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
2026-08-11 14:52:49 +08:00
Hypatia May
fafb10eecb
Merge commit '38d82c497765ce0344800e3d5af9f1ee073f4bb5' into feat/subagent-report-semantics
2026-08-11 14:50:35 +08:00
Hypatia May
6c4ed5e036
test(snapshot): refresh pins after master merge
2026-08-11 14:45:14 +08:00
Tianyi Cui
a8db48429a
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
2026-08-11 14:43:23 +08:00
Hypatia May
7b8635d47d
test(snapshot): refresh pins after master merge
2026-08-11 14:41:11 +08:00
Hypatia May
8d77761427
Merge commit '6768cbccfd2c8157f215cf7231d9c012b1b2b2d2' into feat/subagent-report-semantics
2026-08-11 14:34:21 +08:00
Yichen Jiang
c345d70f82
Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1
...
Only `docs/module-graph.*` conflicted; generated, so taken from master and
regenerated. `api-proxy.ts` auto-merged — this branch's history read
(`historySourceFor` / `presenterScopeFor` / `historyCutOf`, in that order)
is intact.
Hook bypassed as before: the staged-pairing check hands an archived note path
to `verify-translation-pairing`. The full-corpus gate passes.
2026-08-11 14:32:59 +08:00
Tianyi Cui
a3ca7f09b2
Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
...
# Conflicts:
# packages/sandbox/sandbox-windows-acl/package.json
2026-08-11 14:32:26 +08:00
Tianyi Cui
daf90bda7e
refactor(sdk): remove unreleased project toolchain
2026-08-11 14:20:53 +08:00
Yichen Jiang
b06969b56f
Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1
...
Only `docs/module-graph.*` conflicted, from master's new
`@deepseek-ai/dsh-message-feedback` package; generated, so taken from master
and regenerated.
Hook bypassed as before: the staged-pairing check hands an archived note path
to `verify-translation-pairing`. The full-corpus gate passes.
2026-08-11 14:13:32 +08:00
ZiyaZhang
e800493494
fix(ci): refresh module graph pairing
2026-08-10 23:04:05 -07:00
Hypatia May
66cdba7c6c
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
...
# Conflicts:
# 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/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-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/headless-agent/tests/snapshots/compaction-recovery/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
2026-08-11 13:58:56 +08:00
Hypatia May
9a8a2fc206
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
...
# Conflicts:
# 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/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-mixed/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.1.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/headless-agent/tests/snapshots/compaction-recovery/session.jsonl
# examples/headless-agent/tests/snapshots/pty-tools/session.jsonl
2026-08-11 13:55:11 +08:00
Hypatia May
d4c125ceee
Merge commit '580051aeb594e683b6fe088b04d9bffe4c4b5b62' into feat/subagent-report-semantics
2026-08-11 13:50:44 +08:00
_Kerman
c8a201bebd
Merge remote-tracking branch 'origin/master' into feat/web-session-log-export
2026-08-11 13:46:46 +08:00
Ziya
9903d38cf9
Merge branch 'master' into feat/produced-files-folder
2026-08-11 13:31:29 +08:00
Ziya
b0e022c150
Merge pull request #2217 from deepseek-harness/agent/message-feedback-backend
...
feat(feedback): add durable message feedback backend
2026-08-11 13:29:20 +08:00
Ziya
c57221a6b6
Merge branch 'master' into feat/produced-files-folder
2026-08-11 13:25:22 +08:00
hypatiamay
c76570a3b8
Merge pull request #2138 from deepseek-harness/feat/parallel-subagent-calls
...
feat(subagent): sibling delegations are concurrency-safe
2026-08-11 13:24:43 +08:00
Ziya
548b89c3d0
Merge branch 'master' into feat/produced-files-folder
2026-08-11 13:24:43 +08:00
ZiyaZhang
682451d001
fix(ci): refresh merged doc pairings
2026-08-10 22:17:08 -07:00
Ziya
d78d4a6189
Merge branch 'master' into agent/message-feedback-backend
2026-08-11 13:10:06 +08:00
Turtle
d8e89e1644
Merge pull request #2198 from deepseek-harness/codex/fix-clone-instructions
...
docs: replace nonexistent repository references
2026-08-11 13:09:19 +08:00
Hypatia May
48dd924eda
Merge branch 'feat/subagent-settlement-delivery' into feat/subagent-list-agents-vocabulary
2026-08-11 13:02:40 +08:00
Hypatia May
9340604ea5
Merge branch 'feat/subagent-report-semantics' into feat/subagent-settlement-delivery
2026-08-11 13:02:22 +08:00
Hypatia May
dbcbdfa9ce
Merge commit '7baf2c33efb98eeea690c5ac58579c95dc52edd1' into feat/subagent-report-semantics
2026-08-11 13:01:29 +08:00
_Kerman
1b8175ddfd
Merge remote-tracking branch 'origin/master' into feat/web-session-log-export
2026-08-11 12:59:05 +08:00
Yichen Jiang
cc1cf12cb6
Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1
...
Generated docs (`module-graph`, `event-producer-consumer`) taken from master
and regenerated. The `cordis-inspect-jsdoc` golden likewise: master's copy is
the base, and this branch's `presentAs` per-scope rewording is re-applied on
top, since `cordis_inspect` renders that JSDoc into model-visible output.
Hook bypassed as before: the staged-pairing check hands an archived note path
to `verify-translation-pairing`. The full-corpus gate passes.
2026-08-11 12:57:58 +08:00
_Kerman
96646ce481
chore: regenerate cordis catalog after merging latest master
2026-08-11 12:55:39 +08:00
_Kerman
4724a69476
Merge remote-tracking branch 'origin/master' into feat/web-session-log-export
2026-08-11 12:54:33 +08:00
ZiyaZhang
ee1a88c9f1
feat(web): make produced-file overflow discoverable
2026-08-10 21:53:38 -07:00
_Kerman
b701090c4f
docs: refresh module graph after merging master
2026-08-11 12:49:47 +08:00
Ziya
Tianyi Cui
ZiyaZhang
imccyu
Turtle
Yichen Jiang
Hypatia May
_Kerman