Merge remote-tracking branch 'origin/master' into codex/status-bar-token-metrics

# Conflicts:
#	docs/cordis-catalog/services.md
#	docs/core-data-structures/session.i18n.yaml
#	docs/core-data-structures/session.md
#	docs/core-data-structures/session.zh.md
#	docs/persistence-catalog.md
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	packages/cordis/tool-cordis/src/api-catalog.ts
#	packages/core/session/src/types.ts
This commit is contained in:
Hypatia May
2026-07-30 17:11:53 +08:00
50 changed files with 889 additions and 146 deletions
+2 -2
View File
@@ -2,5 +2,5 @@
# side as of the last confirmed-consistent state. Both languages carry equal authority;
# after editing either side, bring the other along and re-record with:
# pnpm run verify-translation-pairing --write docs/core-data-structures/session.md
session.md: 2a0b7a679c2ee3f24d5bb7966591197f2eba1bef
session.zh.md: bb220dba51fe6de26559527cefe55f1e8a318df2
session.md: d315c63daec2fd7dae23406e4a513a746b05c1b8
session.zh.md: c616626c8b022e9cbd94f55153286f8626926588