pku-xht
08aed20139
test(ci): stabilize cross-platform consumer gates
2026-08-25 19:27:34 +08:00
pku-xht
d372dceee1
Merge commit '74a6e1e5cf520cdde8bf461d9051c81142fd6afe' into codex/dsh-sdk-dynamic-subagent-routing
2026-08-25 19:25:22 +08:00
pku-xht
88f518097b
Merge commit '74a6e1e5cf520cdde8bf461d9051c81142fd6afe' into codex/product-subagent-runtime-refresh-claude-code
2026-08-25 19:15:55 +08:00
pku-xht
f217795644
Merge commit 'a0e4561b88e76172dd779bef4b5e8c454550c3e9' into codex/dsh-sdk-minimal-diagnostics
2026-08-25 19:10:14 +08:00
lsdsjy
ad1156eb0b
Merge pull request #2904 from deepseek-harness/feat/headless-reasoning-progress
...
feat(headless): stream reasoning progress to stderr
2026-08-25 19:09:47 +08:00
Ziya and ZiyaZhang
b565df3442
feat(web): show exact per-turn token usage ( #3005 )
...
* feat(web): show exact per-turn token usage
* test(runtime): refresh exact token usage snapshots
* refactor(token-meter): own per-turn usage folding
* perf(ui-chat): bound paging anchor layout reads
* test(web): align usage golden with system prompt row
* fix(test): resolve token-meter client from source
* test(token-meter): cover retry without usage
---------
Co-authored-by: ZiyaZhang <199893125+ZiyaZhang@users.noreply.github.com >
2026-08-25 19:05:52 +08:00
lsdsjy
7c7e4aada8
fix(snapshot): project headless reasoning stderr
2026-08-25 18:51:37 +08:00
pku-xht
b274f5e606
test: refresh dynamic route prompts after master
2026-08-25 18:39:26 +08:00
pku-xht
09fcf48ad8
test(snapshot): refresh DSH diagnostic prompt
2026-08-25 18:32:13 +08:00
pku-xht
311d565ace
Merge commit '8385aeecf95a4b842e8c317ab75ce26cafe8ba90' into codex/dsh-sdk-dynamic-subagent-routing
2026-08-25 18:31:27 +08:00
pku-xht
e52b940781
Merge master into codex/dsh-sdk-minimal-diagnostics
2026-08-25 18:28:47 +08:00
lsdsjy
5c98d5ece8
fix(fs): tolerate null editor placeholders
2026-08-25 18:28:09 +08:00
pku-xht
c97f985caa
test: stabilize post-merge integration fixtures
2026-08-25 18:22:42 +08:00
pku-xht
c2fb21d13a
Merge commit 'ead58a4a476200de2a2f2549ef6a02e73752b618' into codex/dsh-sdk-dynamic-subagent-routing
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-27-typescript-sdk-and-sdk-subagent-backend.i18n.yaml
# .agents/notes/implemented/feature/2026-07-27-typescript-sdk-and-sdk-subagent-backend.md
# .agents/notes/implemented/feature/2026-07-27-typescript-sdk-and-sdk-subagent-backend.zh.md
# examples/python-sdk-agent/tests/sdk.snapshot.ts
# packages/sdk/client/README.i18n.yaml
# packages/sdk/client/README.md
# packages/sdk/client/README.zh.md
# packages/sdk/client/src/types.ts
# packages/sdk/protocol/README.i18n.yaml
# packages/sdk/protocol/README.md
# packages/sdk/protocol/README.zh.md
# packages/sdk/server/src/server.ts
# packages/subagent/subagent-dsh-sdk/tests/fixtures/loader/snapshot.cordis.yml
# packages/subagent/subagent-dsh-sdk/tests/fixtures/loader/snapshot.replay.cordis.yml
2026-08-25 18:01:08 +08:00
pku-xht
19fe4ffb1b
Merge commit 'ead58a4a476200de2a2f2549ef6a02e73752b618' into codex/product-subagent-runtime-refresh-claude-code
...
# Conflicts:
# examples/acp-agent/tests/snapshots/product-subagent-result-diagnostic/stdout.expected.jsonl
# snapshots/session/product-subagent-result-diagnostic/session.jsonl
2026-08-25 17:54:09 +08:00
pku-xht
12dadc1f24
Merge commit '562d15dbb637e5eb15ddafd9167a21ee75b14d91' into codex/dsh-sdk-minimal-diagnostics
...
# Conflicts:
# .github/workflows/ci.yml
# scripts/ci-workflow.spec.ts
2026-08-25 16:33:17 +08:00
pku-xht
0e632c82d0
Merge master into codex/dsh-sdk-minimal-diagnostics
2026-08-25 16:18:27 +08:00
Dudu-0223
6199f477de
test(snapshot): sync web search trust prompt
2026-08-25 16:04:38 +08:00
creatixchu
1f288ede79
test(snapshot): refresh image request header
2026-08-25 15:59:44 +08:00
Dudu-0223
44468d4583
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
2026-08-25 15:53:46 +08:00
creatixchu
eea65e5275
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 15:52:17 +08:00
07akioni
e5dbb368cd
Merge pull request #2631 from deepseek-harness/worktree/fix-web-chat-system-prompt
...
fix(web): show system prompts in chat
2026-08-25 15:41:43 +08:00
creatixchu
b2701b4ef9
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 15:20:59 +08:00
Dudu-0223
8da063441b
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
2026-08-25 15:17:09 +08:00
_Kerman
96db1c8c81
fix(snapshot): canonicalize cache-split chunk runs
2026-08-25 15:10:26 +08:00
pku-xht
13f373f0ce
Merge master into codex/acp-minimal-diagnostics
2026-08-25 14:49:59 +08:00
07akioni
61b65d3147
fix(web): show system prompts in chat
...
Render reconstructable system prompts at each request-series boundary, preserve series declarations through pre-step wrappers, and keep the presentation and replay snapshots aligned across clients.
2026-08-25 14:44:08 +08:00
Dudu-0223
aaf0924b48
Merge origin/master into fix/web-fetch-ssrf
2026-08-25 14:40:51 +08:00
_Kerman
b588675ccf
Merge remote-tracking branch 'origin/master' into xtr/projection-per-session-cache
...
# Conflicts:
# pnpm-lock.yaml
2026-08-25 14:40:22 +08:00
creatixchu
a235f48c69
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 14:37:52 +08:00
_Kerman
9365ef496d
Merge remote-tracking branch 'origin/master' into xtr/message-tool-call-id
...
# Conflicts:
# packages/acp/acp/tests/approval.spec.ts
# packages/acp/acp/tests/edges.spec.ts
# packages/api/session-controller/tests/event-script.client.ts
# packages/client/connection/src/client/fixture.ts
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-conversation/src/client/contract/views.ts
# packages/client/ui-conversation/src/client/index.ts
# packages/client/ui-conversation/src/client/stores.ts
# packages/core/agent-loop/tests/loop.spec.ts
# packages/extensions/cordis-client-runner/src/client/slot-catalog.ts
# packages/extensions/tool-cordis/src/api-catalog.ts
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/events.ts
# packages/host/apiproxy/tests/api-proxy-view.spec.ts
# packages/interaction/user-approval/src/index.ts
# packages/llm/llm-deepseek/tests/adapter.e2e.ts
# packages/llm/llm-pi-ai/src/context.ts
# packages/llm/llm-pi-ai/tests/context.spec.ts
# packages/llm/llm/tests/content.spec.ts
# packages/subagent/subagent/tests/continuation.spec.ts
# packages/subagent/tool-subagent/tests/tool-subagent.spec.ts
# packages/test-support/llm-replay/tests/llm-replay.spec.ts
# packages/todo/tool-todo/tests/tool-todo.spec.ts
# scripts/gen-persistence-catalog.ts
2026-08-25 14:37:44 +08:00
Yichen Jiang
c612f2071d
Merge pull request #3046 from deepseek-harness/worktree/fix-persistent-bash-pipeline-readiness
...
fix(pty): distinguish pipeline reads from terminal input
2026-08-25 14:33:37 +08:00
_Kerman
2c17b3048e
fix(bundle): enable projection cache in base-backed profiles
2026-08-25 14:33:05 +08:00
pku-xht
8bab9d1731
Merge commit '7ef7175ff0c16623ab4e43187d1ecc29820b3909' into codex/acp-minimal-diagnostics
2026-08-25 14:31:14 +08:00
pku-xht
f7a885a522
Merge commit '4b592eb90df20dc53dd12215921d5a9137214777' into codex/acp-minimal-diagnostics
...
# Conflicts:
# apps/cli/tests/profiles/acp/tests/snapshots/subagent-acp-diagnostic/input.json
# apps/cli/tests/profiles/acp/tests/snapshots/subagent-acp-diagnostic/replay.override.json
# apps/cli/tests/profiles/acp/tests/snapshots/subagent-acp-diagnostic/session.jsonl
# apps/cli/tests/profiles/acp/tests/snapshots/subagent-acp-diagnostic/stdout.expected.jsonl
# apps/cli/tests/profiles/acp/tests/snapshots/subagent-acp-diagnostic/tool-schemas.expected.json
# examples/acp-agent/tests/acp.snapshot.ts
# packages/subagent/subagent-acp/src/run.ts
# packages/subagent/subagent-acp/tests/mock-acp-server.ts
2026-08-25 14:28:36 +08:00
Yichen Jiang
ba84299c98
test(web): record the Turn rail in every affected aria golden
...
The rail is a landmark on every Chat wide enough to show it, so each
recorded conversation with at least two loaded Turns now carries the
navigation node and its marks.
2026-08-25 14:26:10 +08:00
Dudu-0223
797c711e11
refactor(web): remove fetch approval policy
2026-08-25 14:25:12 +08:00
creatixchu
718dd4d1b4
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 14:19:37 +08:00
Yichen Jiang
d38ff54150
feat(web): navigate loaded Chat Turns from a compact rail
...
ChatView derives one navigation mark per currently loaded Turn, keyed by
Turn number and anchored on that Turn's first loaded user node. The rail
sits against the scrollport's right edge, centered in the band the sticky
composer leaves visible; hover and keyboard focus preview the Turn's
prompt and response, and activating a mark moves the shared scrollport
and records the resulting restoration anchor.
ConversationRoot publishes --dsh-conversation-viewport-height beside the
composer height it already measures on the scrollport, so floating View
chrome can center in that band without assuming a Session header height.
2026-08-25 14:02:57 +08:00
creatixchu
4309dab24b
fix(snapshot): honor ACP-local sidecar sources
2026-08-25 14:02:12 +08:00
Yichen Jiang
5467685bc1
fix(pty): identify waiting thread terminals
2026-08-25 13:35:53 +08:00
Dudu-0223
04e946ed8b
test(web): refresh fetch and trust snapshots
2026-08-25 11:37:22 +08:00
Yichen Jiang
0f7b28ad31
test(snapshot): refresh web prompt pins
2026-08-25 11:33:21 +08:00
Yichen Jiang
4d859cc062
test(web): align system-prompt pins with the reference guidance
...
The pinned prompts were recorded on master before this branch's
file-reference guidance rewrite; refresh them so the pin carries the
directory-aware wording the assembly now produces.
2026-08-25 11:27:30 +08:00
Yichen Jiang
5b3bfbed42
test(snapshot): refresh prompt order pins
2026-08-25 11:24:25 +08:00
Dudu-0223
433aab2724
test(web): refresh fetch tool schema snapshots
2026-08-25 11:22:42 +08:00
Dudu-0223
1af98028fa
test(web): refresh external content prompt snapshots
2026-08-25 11:17:25 +08:00
creatixchu
1c065f3cd4
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
...
# Conflicts:
# apps/cli/tests/profiles/acp/image-compaction.cordis.snapshot.yml
# apps/cli/tests/profiles/acp/image-compaction.cordis.yml
# apps/cli/tests/profiles/acp/tests/snapshots/image-compaction/input.json
# apps/cli/tests/profiles/acp/tests/snapshots/image-compaction/session.jsonl
# apps/cli/tests/profiles/acp/tests/snapshots/image-compaction/stdout.expected.jsonl
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# examples/acp-agent/tests/acp.snapshot.ts
# packages/llm/token-meter/README.i18n.yaml
# packages/llm/token-meter/README.md
# packages/llm/token-meter/README.zh.md
# packages/llm/token-meter/src/index.ts
# packages/llm/token-meter/src/surface-fold.ts
2026-08-25 11:15:35 +08:00
Yichen Jiang
43ac97b554
fix(system-prompt): centralize sparse section orders
2026-08-25 11:06:01 +08:00
Yichen Jiang
0a247137f0
Merge remote-tracking branch 'origin/master' into worktree/web-textarea-refactor-991614
...
# Conflicts:
# apps/web/tests/composer-draft-scroll.e2e.ts
# apps/web/tests/expected/reference-composer/caret-edits.expected.md
# apps/web/tests/startup-auto-selection.e2e.ts
# pnpm-lock.yaml
2026-08-25 10:42:32 +08:00