pku-xht
2a9b940ef5
feat(web): list active reminders in the session header
2026-08-25 18:50:50 +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
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
Yichen Jiang
5ee10b3ebd
Merge remote-tracking branch 'origin/master' into worktree/process-plugin-streaming-72f9b3
...
# Conflicts:
# packages/client/ui-chat/src/client/chat/ContextInjectionRow.tsx
2026-08-25 16:50:24 +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
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
imccyu
a1781cc4a8
Merge pull request #3054 from deepseek-harness/worktree-revert2698
...
revert(session): remove streaming format migration pipeline
2026-08-25 15:47:19 +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
imccyu
211e6939e3
Revert "Merge pull request #2698 from deepseek-harness/xtr/session-format-migration"
...
This reverts commit 4b592eb90df20dc53dd12215921d5a9137214777, reversing
changes made to d15d3275d905e4d21229cd70a074388a428189d1.
2026-08-25 15:30:10 +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
creatixchu
d978d6f90c
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 15:04:56 +08:00
pku-xht
13f373f0ce
Merge master into codex/acp-minimal-diagnostics
2026-08-25 14:49:59 +08:00
Dudu-0223
8e681a66b9
Merge origin/master into fix/web-fetch-ssrf
2026-08-25 14:46:26 +08:00
_Kerman
38355623a2
Merge remote-tracking branch 'origin/master' into xtr/projection-per-session-cache
...
# Conflicts:
# packages/bundle/web-app/README.i18n.yaml
# packages/bundle/web-app/README.md
# packages/bundle/web-app/README.zh.md
2026-08-25 14:45:03 +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
_Kerman
804db36546
Merge remote-tracking branch 'origin/master' into xtr/message-tool-call-id
2026-08-25 14:42:35 +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
_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
5cd435e917
Merge remote-tracking branch 'origin/master' into worktree/process-plugin-streaming-72f9b3
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/client/ui-chat/src/client/contract/slots.ts
# packages/shell/tool-pwsh/package.json
# packages/workflow/tool-workflow/src/index.ts
# python/sdk-runtime/package.json
2026-08-25 14:36:33 +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
Dudu-0223
797c711e11
refactor(web): remove fetch approval policy
2026-08-25 14:25:12 +08:00
Tianyi Cui
3b3b493a96
fix(web): retain launch token across reloads
2026-08-25 14:23:46 +08:00
Tianyi Cui
ce031ddd16
fix(web): cover authenticated host runtimes
2026-08-25 14:23:46 +08:00
Tianyi Cui
3e24087bfa
fix(web): authenticate the browser Host API
2026-08-25 14:23:45 +08:00
creatixchu
718dd4d1b4
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 14:19:37 +08:00
creatixchu
0d9bdccb7b
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 14:03:24 +08:00
Yichen Jiang
152d949f3e
Merge remote-tracking branch 'origin/master' into worktree/system-prompt-order-bands
2026-08-25 13:53:44 +08:00
creatixchu
bcdbd85d15
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 13:43:45 +08:00
_Kerman
e46a2499df
Merge remote-tracking branch 'origin/master' into xtr/durable-inbox-recovery
...
# Conflicts:
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# docs/module-graph.i18n.yaml
# docs/module-graph.md
# docs/module-graph.zh.md
# packages/api/session-controller/tests/session-projections.host.spec.ts
2026-08-25 13:20:42 +08:00
_Kerman
2664200844
Merge remote-tracking branch 'github/master' into xtr/session-format-migration
2026-08-25 13:04:23 +08:00
_Kerman
e5a41d164b
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2781
2026-08-25 13:04:04 +08:00
_Kerman
e62d6d3d15
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2781
2026-08-25 12:49:32 +08:00
_Kerman
d385dfb3e3
Merge remote-tracking branch 'github/master' into xtr/session-format-migration
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# packages/session/session-persistence-jsonl/src/index.ts
# packages/session/session-persistence/src/coordinator.ts
# packages/session/session-persistence/src/index.ts
2026-08-25 12:41:23 +08:00
Tianyi Cui
43f0f07f9b
refactor(prompt): remove unused complete-persona config
2026-08-25 12:21:50 +08:00
Tianyi Cui
d35459e3c1
refactor(sdk): remove unused root tool filter
2026-08-25 12:21:50 +08:00
Yichen Jiang
145e060992
Merge remote-tracking branch 'origin/master' into worktree/system-prompt-order-bands
2026-08-25 12:07:56 +08:00
Yichen Jiang
8020f6386d
docs(system-prompt): sync first-party order references
2026-08-25 12:05:38 +08:00
Yichen Jiang
61aadb3abf
feat(activity): one session-header task list joining jobs with their activities
...
Browser acceptance of the activity panel surfaced the product problem: a
background bash registers in both planes, so the header grew two near-
identical popovers — "background jobs" with lifecycle and duration,
"activities" with live output — listing the same work twice.
The service planes stay orthogonal (jobs: model-visible control with a
consuming read cursor; activities: transient non-consuming observation).
The join happens per row in the UI projection instead:
- dsh-client-ui-activity renders the single merged "tasks" list. Each
jobsBySession row joins the activity carrying its correlation.jobId —
the job supplies identity, lifecycle (stopping exists only there),
duration, and the model-visible detail; the activity supplies the
expandable live-output panel. Standalone activities (workflow runs)
keep their own rows; without the activity registry, job rows still
render and the control degrades to the old job list exactly.
- dsh-client-ui-jobs is deleted (pre-release, no shim); the merged entry
takes its slot order. The job locale namespace folds into activity.
- User-facing copy says "task" (任务): N tasks running / N 个任务进行中.
- Hierarchy: live rows first as two lines (label over kind badge and
status, ticking duration), a Finished divider when both sections
exist, settled rows compacted to one de-emphasized line, and the
output panel hangs behind a spine under its row.
Deliberately not joined: subagent rows stay bare (the subagent panel is
their surface) and foreground commands stay in tool cards.
Both web e2e scenarios now assert one Tasks list; the background-job
scenario's row gained a live-output panel, proving the join end to end.
Agent Note: 2026-08-25-unified-task-list.
2026-08-25 11:58:43 +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
55eeaf6565
docs: refresh module graph
2026-08-25 11:12:21 +08:00
Yichen Jiang
43ac97b554
fix(system-prompt): centralize sparse section orders
2026-08-25 11:06:01 +08:00
_Kerman
3c8b5a26a4
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2781
...
# Conflicts:
# docs/config-catalog.i18n.yaml
# docs/config-catalog.md
# docs/config-catalog.zh.md
# docs/event-producer-consumer.i18n.yaml
# docs/event-producer-consumer.md
# docs/event-producer-consumer.zh.md
# docs/subsystems/session-projection.i18n.yaml
# docs/subsystems/session-projection.md
# docs/subsystems/session-projection.zh.md
# packages/api/session-controller/src/history.ts
# packages/api/session-controller/tests/session-cold.host.spec.ts
# packages/extensions/tool-cordis/src/api-catalog.ts
# packages/session/session-projection-cache/src/index.ts
# packages/session/session-projection-cache/tests/cache.spec.ts
# packages/session/session-projection/src/index.ts
# scripts/run-gates.ts
2026-08-25 10:52:45 +08:00