Chinesezjc
a14dfdea17
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-28 01:07:09 +08:00
imccyu
fd9d1b3350
Merge pull request #600 from deepseek-harness/worktree/web-session-model-selector
...
feat(web): add session model selector
2026-07-28 01:00:38 +08:00
imccyu
730657375f
Merge branch 'master' into worktree/web-session-model-selector
2026-07-28 00:56:56 +08:00
imccyu
7e2f6f474d
fix: lint
2026-07-28 00:56:37 +08:00
Tianyi Cui
b85c453e22
Merge pull request #786 from deepseek-harness/worktree/dependabot-daily-4am-shanghai-20260728
...
chore: run Dependabot every day at 04:00 Shanghai time
2026-07-28 00:55:54 +08:00
Tianyi Cui
f0459e7cdb
Merge remote-tracking branch 'origin/master' into worktree/dependabot-daily-4am-shanghai-20260728
2026-07-28 00:50:44 +08:00
Tianyi Cui
3b62de1522
Merge pull request #703 from deepseek-harness/sdk/ts-client-and-subagent
...
feat(sdk): TypeScript SDK over stdio JSON-RPC + SDK subagent backend
2026-07-28 00:50:21 +08:00
Tianyi Cui
c102c929ca
chore: run Dependabot daily at 04:00 Shanghai time
2026-07-28 00:48:38 +08:00
imccyu
2c5c1e72ba
fix: merge conflicts
2026-07-28 00:45:27 +08:00
Chinesezjc
c136fa6f58
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-28 00:42:37 +08:00
imccyu
94af1589a9
Merge branch 'master' into worktree/web-session-model-selector
2026-07-28 00:40:08 +08:00
imccyu
af70af4020
Merge remote-tracking branch 'origin/master' into worktree/web-session-model-selector
2026-07-28 00:39:24 +08:00
Tianyi Cui
177b7c3286
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
2026-07-28 00:37:26 +08:00
Tianyi Cui
dde4b3d518
Merge pull request #762 from deepseek-harness/worktree/explicit-change-scope-report-20260727
...
feat(dev-infra): report explicit repository change scope
2026-07-28 00:36:31 +08:00
Tianyi Cui
88aa3f8959
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
2026-07-28 00:33:36 +08:00
Tianyi Cui
b1dc759fee
Merge remote-tracking branch 'origin/master' into worktree/pr762-merge-20260728
2026-07-28 00:29:00 +08:00
Tianyi Cui
da396223f1
Merge pull request #760 from deepseek-harness/worktree/worktree-local-lefthook-20260727
...
fix(dev-infra): isolate Lefthook per worktree
2026-07-28 00:26:00 +08:00
Tianyi Cui
20ded66ffb
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
2026-07-28 00:24:19 +08:00
Tianyi Cui
cc8f6a30c0
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
...
# Conflicts:
# docs/architecture.i18n.yaml
# packages/core/agent-loop/src/agent.ts
2026-07-28 00:23:27 +08:00
Chinesezjc
5d6a547d62
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
...
# Conflicts:
# examples/acp-agent/tests/snapshots/bash-spill/session.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/pty-tools/session.jsonl
# packages/client/ui-conversation/README.i18n.yaml
2026-07-28 00:21:43 +08:00
Tianyi Cui
0e89e4452f
Merge remote-tracking branch 'origin/master' into worktree/worktree-local-lefthook-20260727
2026-07-28 00:17:54 +08:00
Tianyi Cui
3994bdd5b6
Merge pull request #717 from deepseek-harness/codex/bump-pi-ai-0.82.1
...
chore(llm): bump pi-ai to 0.82.1
2026-07-28 00:17:07 +08:00
Tianyi Cui
c8814d7347
test(acp): await goal cancellation persistence
2026-07-28 00:13:09 +08:00
Tianyi Cui
5f49a81514
Merge remote-tracking branch 'origin/master' into worktree/pr717-merge-20260728
...
# Conflicts:
# pnpm-workspace.yaml
2026-07-28 00:13:04 +08:00
Tianyi Cui
cc5201a408
Merge remote-tracking branch 'origin/master' into worktree/worktree-local-lefthook-20260727
2026-07-28 00:08:43 +08:00
Tianyi Cui
ff148ea44b
Merge pull request #743 from deepseek-harness/feature/cordis-temporary-tools
...
Clarify Cordis temporary plugin lifecycle and Web UI
2026-07-28 00:07:45 +08:00
Tianyi Cui
59122b9e85
Merge remote-tracking branch 'origin/master' into worktree/worktree-local-lefthook-20260727
2026-07-28 00:06:16 +08:00
Tianyi Cui
c982cf7805
refactor(dev-infra): narrow worktree hook safety checks
2026-07-28 00:05:31 +08:00
Tianyi Cui
4a45981e76
Merge remote-tracking branch 'origin/master' into worktree/pr743-merge-20260727
...
# Conflicts:
# examples/tui-agent/tests/snapshots/cordis-dynamic-toolchain/terminal.expected.txt
# packages/ui/tui/tests/snapshots/cordis-tools-pending.expected.txt
2026-07-28 00:03:56 +08:00
Chinesezjc
88f6da2350
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-28 00:02:44 +08:00
Tianyi Cui
d8df4f3217
Merge pull request #629 from deepseek-harness/feat/tui-master-port
...
feat(tui): refactor, improvements, maintenance skills
2026-07-28 00:01:37 +08:00
Chinesezjc
38d08ebce6
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 23:59:37 +08:00
Tianyi Cui
064cea4ebe
Merge remote-tracking branch 'origin/master' into worktree/pr743-merge-20260727
...
# Conflicts:
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/session-query-spill/session.jsonl
# examples/cordis-agent/tests/cordis-tools.e2e.ts
# 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
2026-07-27 23:59:33 +08:00
Tianyi Cui
752d4b9204
Merge updated origin/master into feat/tui-master-port
2026-07-27 23:56:54 +08:00
Tianyi Cui
f6a450102e
Merge updated origin/master into feat/tui-master-port
2026-07-27 23:55:53 +08:00
Tianyi Cui
0dcdf188e2
Merge pull request #783 from deepseek-harness/worktree/agent-note-supersession-check-20260727
...
Require Agent Note supersession checks
2026-07-27 23:55:20 +08:00
Chinesezjc
dc42b3e7ad
test(snapshots): restore parallel todo description in advanced-toolchain fixtures
...
The merge of origin/master resolved these three fixtures with --theirs,
which kept master's tool-schema changes but dropped this branch's
refreshed todo_write description. Re-apply the description substitution
on top of master's content so both sides survive.
2026-07-27 23:52:57 +08:00
Tianyi Cui
2973dbae59
fix(ci): read durable skill catalog in TUI smoke
2026-07-27 23:50:38 +08:00
Tianyi Cui
861b7a7b8f
Merge branch 'master' into codex/bump-pi-ai-0.82.1
2026-07-27 23:49:33 +08:00
Tianyi Cui
95bba22f84
Merge remote-tracking branch 'origin/master' into worktree/worktree-local-lefthook-20260727
2026-07-27 23:47:28 +08:00
Chinesezjc
8e35b720b4
Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress
2026-07-27 23:46:22 +08:00
Tianyi Cui
5175ab4019
Merge branch 'master' into worktree/agent-note-supersession-check-20260727
2026-07-27 23:44:06 +08:00
Tianyi Cui
67dca8c84c
Merge pull request #628 from deepseek-harness/codex/provider-retry-policy
...
feat(llm): add per-provider retry policies
2026-07-27 23:44:01 +08:00
Tianyi Cui
1c1e52bd3f
Merge updated PR branch into agent-loop CI fix
2026-07-27 23:42:12 +08:00
Tianyi Cui
fe22273e28
fix(agent-loop): await final session flush
2026-07-27 23:41:27 +08:00
Tianyi Cui
91944bc1aa
Merge branch 'master' into codex/bump-pi-ai-0.82.1
2026-07-27 23:40:39 +08:00
Tianyi Cui
18835ca838
Merge updated origin/master into feat/tui-master-port
2026-07-27 23:39:59 +08:00
Tianyi Cui
cc54423b29
fix(ci): refresh Cordis service catalog
2026-07-27 23:39:19 +08:00
Tianyi Cui
35697a4529
Merge origin/master into Agent Note supersession checks
2026-07-27 23:39:18 +08:00
Tianyi Cui
6241eb6044
Require Agent Note supersession checks
2026-07-27 23:38:49 +08:00
