fix: restore latest-main ci gates

src/agents/subagent-announce-delivery.ts

@@ -2,7 +2,11 @@ import type { ConversationRef } from "../infra/outbound/session-binding-service.
 import { normalizeAccountId, normalizeMainKey } from "../routing/session-key.js";
 import { defaultRuntime } from "../runtime.js";
 import { isCronSessionKey } from "../sessions/session-key-utils.js";
-import { resolveConversationDeliveryTarget } from "../utils/delivery-context.js";
+import {
+  mergeDeliveryContext,
+  normalizeDeliveryContext,
+  resolveConversationDeliveryTarget,
+} from "../utils/delivery-context.js";
 import {
   INTERNAL_MESSAGE_CHANNEL,
   isGatewayMessageChannel,

src/agents/subagent-announce.ts

@@ -13,11 +13,11 @@ import {
   deliverSubagentAnnouncement,
   loadRequesterSessionEntry,
   loadSessionEntryByKey,
-  resolveAnnounceOrigin,
   runAnnounceDeliveryWithRetry,
   resolveSubagentAnnounceTimeoutMs,
   resolveSubagentCompletionOrigin,
 } from "./subagent-announce-delivery.js";
+import { resolveAnnounceOrigin } from "./subagent-announce-origin.js";
 import {
   applySubagentWaitOutcome,
   buildChildCompletionFindings,

src/plugins/contracts/registry.ts

@@ -102,6 +102,7 @@ function resolveBundledManifestContracts(): PluginRegistrationContractEntry[] {
       mediaUnderstandingProviderIds: [...entry.mediaUnderstandingProviderIds],
       imageGenerationProviderIds: [...entry.imageGenerationProviderIds],
       videoGenerationProviderIds: [...entry.videoGenerationProviderIds],
+      musicGenerationProviderIds: [...entry.musicGenerationProviderIds],
       webFetchProviderIds: [...entry.webFetchProviderIds],
       webSearchProviderIds: [...entry.webSearchProviderIds],
       toolNames: [...entry.toolNames],

src/plugins/contracts/speech-vitest-registry.ts

@@ -77,6 +77,9 @@ const VITEST_CONTRACT_PLUGIN_IDS = {
   videoGenerationProviders: BUNDLED_PLUGIN_CONTRACT_SNAPSHOTS.filter(
     (entry) => entry.videoGenerationProviderIds.length > 0,
   ).map((entry) => entry.pluginId),
+  musicGenerationProviders: BUNDLED_PLUGIN_CONTRACT_SNAPSHOTS.filter(
+    (entry) => entry.musicGenerationProviderIds.length > 0,
+  ).map((entry) => entry.pluginId),
 } satisfies Record<ManifestContractKey, string[]>;
 
 function loadVitestVideoGenerationFallbackEntries(