Yichen Jiang
bf0db65bb0
fix(ui-settings-models): address review — derived key fact, required render seat, spec sync
...
The provider-card seat's keyConfigured now derives from the reference the
page would use — the profile's apiKeyEnv, or the page's derived
<ROUTE>_API_KEY while the profile names none — so the add-provider draft
agrees with its own editor about an existing conventional credential (the
store joins the derived describe in the same batched call, as
ProviderRow.derivedCredential). ModelsSectionProps makes the renderSlot seat
required so a direct render that forgets it fails to compile; the one such
render in provider-form.client.spec regained a real mount and the test
boilerplate collapsed to renderSlot={() => null}. The extension-slots Agent
Note now states the keyed cell's real override rule (same priority throws,
a different priority shadows), and docs/subsystems/slots.md carries the two
new seats in its hierarchy, both languages.
2026-08-26 17:12:58 +08:00
_Kerman
bf83f0889b
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2731
2026-08-26 11:40:56 +08:00
imccyu
5752b1dc3c
docs(agent-presets): refresh @Remote migration references
2026-08-26 11:18:36 +08:00
_Kerman
6a311f0638
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2731
2026-08-26 11:17:50 +08:00
fengsy
eadd5df82b
fix(team): preserve current Client architecture after rebase
2026-08-26 10:56:57 +08:00
Dudu-0223
806642b064
feat(team): add experimental Agent Teams Web profile
2026-08-26 10:56:57 +08:00
_Kerman
d3dd816d67
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2731
...
# Conflicts:
# packages/util/brand/README.i18n.yaml
# packages/util/brand/README.md
# packages/util/brand/README.zh.md
2026-08-26 10:35:38 +08:00
Tianyi Cui
0d551b9f5c
docs(session): align SQLite schema evidence
2026-08-26 01:39:53 +08:00
Tianyi Cui
42dc2a46c2
refactor(session): require known event types on read
2026-08-26 00:22:31 +08:00
Magolor
0b5eba0c8d
docs: rebuild the documentation skill and standards ( #2983 )
2026-08-25 23:47:20 +08:00
_Kerman
248d22f2c6
Merge remote-tracking branch 'origin/master' into xtr/message-tool-call-id
2026-08-25 21:44:26 +08:00
_Kerman
741083f03b
Merge remote-tracking branch 'origin/master' into xtr/projection-per-session-cache
2026-08-25 20:54:08 +08:00
_Kerman
f436c888aa
Merge remote-tracking branch 'origin/master' into xtr/message-tool-call-id
2026-08-25 20:24:54 +08:00
_Kerman
d79ff0b589
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2781
2026-08-25 20:15:26 +08:00
imccyu
f37bb35a97
perf(conversation): fold packed assistant history
2026-08-25 20:15:06 +08:00
_Kerman
3f34c026e3
Merge remote-tracking branch 'origin/master' into dshw/pr-deepseek-harness-deepseek-harness-2781
2026-08-25 20:04:32 +08:00
creatixchu
e497ea69b1
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 19:56:17 +08:00
pku-xht
d372dceee1
Merge commit '74a6e1e5cf520cdde8bf461d9051c81142fd6afe' into codex/dsh-sdk-dynamic-subagent-routing
2026-08-25 19:25:22 +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
pku-xht
311d565ace
Merge commit '8385aeecf95a4b842e8c317ab75ce26cafe8ba90' into codex/dsh-sdk-dynamic-subagent-routing
2026-08-25 18:31:27 +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
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
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
d978d6f90c
Merge remote-tracking branch 'origin/master' into worktree/2848-image-token-pressure
2026-08-25 15:04:56 +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
Dudu-0223
797c711e11
refactor(web): remove fetch approval policy
2026-08-25 14:25:12 +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
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
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
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
_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
creatixchu
dde6c8d7fc
Merge remote-tracking branch 'origin/master' into worktree/2986-trajectory-image-attachments
2026-08-25 10:50:06 +08:00
Dudu-0223
8bf8e42b63
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
2026-08-25 09:38:28 +08:00
Dudu-0223
070a180a10
Merge remote-tracking branch 'origin/master' into fix/web-fetch-ssrf
...
# Conflicts:
# examples/acp-agent/tests/acp.snapshot.ts
# examples/acp-agent/tests/snapshots/web-fetch/input.json
# examples/acp-agent/tests/snapshots/web-fetch/stdout.expected.jsonl
# knip.json
# packages/test-support/session-snapshot/tests/fixtures/web-fetch-network.ts
# snapshots/sdk/subagent-mixed/session.1.jsonl
# snapshots/sdk/subagent-mixed/session.2.jsonl
# snapshots/session/advanced-toolchain-runtime/session.1.jsonl
# snapshots/session/advanced-toolchain-runtime/session.2.jsonl
# snapshots/session/subagent-depth-two-rejection/session.1.jsonl
# snapshots/session/subagent-depth-two-rejection/session.2.jsonl
# snapshots/session/subagent-multi/session.1.jsonl
# snapshots/session/subagent-multi/session.2.jsonl
# snapshots/session/subagent-parallel/session.1.jsonl
# snapshots/session/subagent-parallel/session.2.jsonl
# snapshots/session/web-fetch/session.jsonl
# snapshots/session/web-fetch/web-fetch-fixture-server.mjs
2026-08-25 09:14:36 +08:00
imccyu
075a46cdec
fix(client): preserve combo source identities
2026-08-25 06:43:25 +08:00
Yichen Jiang