From 813aa3551e96cd68f8e7de69d93a5e42583dddb9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 6 Apr 2026 03:37:15 +0100
Subject: [PATCH] fix: restore latest-main ci gates

---
 src/agents/subagent-announce-delivery.ts        | 6 +++++-
 src/agents/subagent-announce.ts                 | 2 +-
 src/plugins/contracts/registry.ts               | 1 +
 src/plugins/contracts/speech-vitest-registry.ts | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/agents/subagent-announce-delivery.ts b/src/agents/subagent-announce-delivery.ts
index aa4362f3ca1..425309962e1 100644
--- a/src/agents/subagent-announce-delivery.ts
+++ b/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,
diff --git a/src/agents/subagent-announce.ts b/src/agents/subagent-announce.ts
index f0a41987ea2..79535e682be 100644
--- a/src/agents/subagent-announce.ts
+++ b/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,
diff --git a/src/plugins/contracts/registry.ts b/src/plugins/contracts/registry.ts
index f0f66d955f7..9a0688e5f4b 100644
--- a/src/plugins/contracts/registry.ts
+++ b/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],
diff --git a/src/plugins/contracts/speech-vitest-registry.ts b/src/plugins/contracts/speech-vitest-registry.ts
index 83f931e2636..6bbac8712ad 100644
--- a/src/plugins/contracts/speech-vitest-registry.ts
+++ b/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(