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:
@@ -1,7 +1,7 @@
|
||||
/** Host loader entry for the browser implementation exported from `./client`. */
|
||||
|
||||
import type { Context } from 'cordis'
|
||||
import z from 'schemastery'
|
||||
import type { Context } from '@deepseek-ai/cordis'
|
||||
import z from '@deepseek-ai/schemastery'
|
||||
import { settingsNamespace } from '@deepseek-ai/dsh-settings'
|
||||
import {
|
||||
WELCOME_NOTICE_ACK_FIELD, WELCOME_NOTICE_SETTINGS_NAMESPACE,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
|
||||
/* jscpd:ignore-start */
|
||||
import type { Context } from 'cordis'
|
||||
import type { Context } from '@deepseek-ai/cordis'
|
||||
import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
|
||||
|
||||
const PACKAGE_NAME = '@deepseek-ai/dsh-client-ui-settings-general'
|
||||
|
||||
Reference in New Issue
Block a user