Merge remote-tracking branch 'origin/master' into codex/disable-telemetry-default
Resolve three conflicts: - packages/bundle/base/tests/base.spec.ts: keep both assertion sets — this branch's telemetry-otel mode expression and master's subagent rows plus manifest dependencies. - packages/session/session-telemetry-otel/tests/otel.spec.ts: keep master's per-mode sharing disclosure test, but select FULL explicitly instead of relying on an omitted mode, because the default is now DISABLED; the default-construction test keeps asserting disabled delivery and gains a case pinning that an omitted mode reports 'disabled' sharing. - scripts/snapshots/translation-prompt-v4/request-response.expected.json: re-recorded from the merged READMEs rather than hand-merging the embedded document text.
This commit is contained in:
@@ -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/config-catalog.md
|
||||
config-catalog.md: 8fb3f7fdef7d3fe46d462e4cf85de137f7d5fa56
|
||||
config-catalog.zh.md: 434f627265dd6181326dbc6d83c95f032c4bb22f
|
||||
config-catalog.md: 8bf8ffb31f87c019173cd45dbc7b804a98aaaa44
|
||||
config-catalog.zh.md: 28aa3cde7d213e35623491530b34cabfff1fcbcb
|
||||
|
||||
Reference in New Issue
Block a user