pku-xht 36a047d436 Merge commit '788bc260f98e31801feccde77efdc985c780065a' into codex/dsh-sdk-minimal-diagnostics ...

# 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
#	docs/config-catalog.i18n.yaml
#	docs/config-catalog.md
#	docs/config-catalog.zh.md
#	packages/sdk/client/README.i18n.yaml
#	packages/sdk/client/README.md
#	packages/sdk/client/README.zh.md
#	packages/sdk/client/tests/sdk-client.spec.ts
#	packages/subagent/subagent-dsh-sdk/README.i18n.yaml
#	packages/subagent/subagent-dsh-sdk/README.md
#	packages/subagent/subagent-dsh-sdk/README.zh.md
#	packages/subagent/subagent-dsh-sdk/src/index.ts
#	packages/subagent/subagent-dsh-sdk/src/run.ts
#	packages/subagent/subagent-dsh-sdk/tests/fixtures/loader/child-mock-llm.ts
#	packages/subagent/subagent-dsh-sdk/tests/loader-composition.e2e.ts
#	packages/subagent/subagent-dsh-sdk/tests/subagent-dsh-sdk.spec.ts
#	snapshots/sdk/sdk.snapshot.ts

2026-08-25 20:50:41 +08:00

..

cli

Merge commit '788bc260f98e31801feccde77efdc985c780065a' into codex/dsh-sdk-minimal-diagnostics

2026-08-25 20:50:41 +08:00

web

feat(web): show exact per-turn token usage (#3005)

2026-08-25 19:05:52 +08:00