npm - @canonry/canonry - Versions diffs - 4.118.0 → 4.124.0 - Mend

@canonry/canonry 4.118.0 → 4.124.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

package/assets/index.html CHANGED Viewed

@@ -12,12 +12,12 @@
     <link rel="icon" type="image/png" sizes="32x32" href="./favicon-32.png" />
     <link rel="apple-touch-icon" href="./apple-touch-icon.png" />
     <title>Canonry</title>
-    <script type="module" crossorigin src="./assets/index-QCFQv0xh.js"></script>
+    <script type="module" crossorigin src="./assets/index-CqFSTLK5.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vendor-tanstack-Be8JdV5M.js">
     <link rel="modulepreload" crossorigin href="./assets/vendor-radix-CQ77EO2y.js">
-    <link rel="modulepreload" crossorigin href="./assets/vendor-recharts-C9EZkgbP.js">
+    <link rel="modulepreload" crossorigin href="./assets/vendor-recharts-DSxTZhaH.js">
     <link rel="modulepreload" crossorigin href="./assets/vendor-markdown-6dwjPOKK.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-Bot6YiD6.css">
+    <link rel="stylesheet" crossorigin href="./assets/index-jymsMBpZ.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/{chunk-HGNY5GL4.js → chunk-4D2XUMMV.js} RENAMED Viewed

@@ -10,7 +10,7 @@ import {
   loadConfig,
   loadConfigRaw,
   saveConfigPatch
-} from "./chunk-75UBTCKS.js";
+} from "./chunk-WGGB7QBD.js";
 import {
   CC_CACHE_DIR,
   DUCKDB_SPEC,
@@ -115,12 +115,14 @@ import {
   siteAuditPages,
   siteAuditSnapshots,
   usageCounters
-} from "./chunk-CMZIPFNQ.js";
+} from "./chunk-BGLBWFMV.js";
 import {
   AGENT_MEMORY_VALUE_MAX_BYTES,
   AGENT_PROVIDER_IDS,
   AI_ENGINE_DOMAINS,
   AI_ENGINE_SELF_DOMAINS,
+  AdsAdGroupBillingEventTypes,
+  AdsCampaignBiddingTypes,
   AgentProviderIds,
   BacklinkSources,
   CcReleaseSyncStatuses,
@@ -142,6 +144,10 @@ import {
   TrafficSourceTypes,
   VERTEX_AI_SEARCH_PROXY_DOMAIN,
   actionConfidenceLabel,
+  adsAccountDtoSchema,
+  adsConversionEventSettingListResponseSchema,
+  adsConversionPixelListResponseSchema,
+  adsGeoSearchResponseSchema,
   agentBusy,
   agentMemoryDeleteRequestSchema,
   agentMemoryUpsertRequestSchema,
@@ -166,6 +172,7 @@ import {
   isGhostTelemetryEvent,
   isRetryableHttpError,
   normalizeIdTokens,
+  normalizeServedModel,
   normalizeUrlPath,
   notFound,
   parseOriginList,
@@ -178,7 +185,7 @@ import {
   validationError,
   winnabilityClassLabel,
   withRetry
-} from "./chunk-KEZWLP4O.js";
+} from "./chunk-SLCGTOKT.js";
 // src/telemetry.ts
 import crypto from "crypto";
@@ -594,6 +601,7 @@ async function executeTrackedQuery(input) {
       provider: "gemini",
       rawResponse,
       model,
+      servedModel: extractServedModel(rawResponse),
       groundingSources: parsed.groundingSources,
       searchQueries: parsed.searchQueries
     };
@@ -619,6 +627,9 @@ function normalizeResult(raw) {
 function hasParsedResponseContent(rawResponse) {
   return Array.isArray(rawResponse.candidates) && rawResponse.candidates.length > 0;
 }
+function extractServedModel(rawResponse) {
+  return normalizeServedModel(rawResponse.modelVersion);
+}
 function reparseStoredResult(rawResponse) {
   const groundingSources = extractGroundingMetadataFromRaw(rawResponse);
   const searchQueries = extractSearchQueriesFromRaw(rawResponse);
@@ -767,7 +778,11 @@ function responseToRecord(response) {
     }));
     return {
       candidates: candidates ?? [],
-      usageMetadata: response.usageMetadata ?? null
+      usageMetadata: response.usageMetadata ?? null,
+      // Gemini reports the identity it actually served here — the only place it
+      // appears. Preserved so `servedModel` can be read back off a stored snapshot.
+      modelVersion: response.modelVersion ?? null,
+      responseId: response.responseId ?? null
     };
   } catch {
     return { error: "failed to serialize response" };
@@ -884,6 +899,7 @@ var geminiAdapter = {
       provider: "gemini",
       rawResponse: raw.rawResponse,
       model: raw.model,
+      servedModel: raw.servedModel,
       groundingSources: raw.groundingSources,
       searchQueries: raw.searchQueries
     };
@@ -1006,6 +1022,7 @@ async function executeTrackedQuery2(input) {
       provider: "openai",
       rawResponse,
       model,
+      servedModel: extractServedModel2(rawResponse),
       groundingSources: parsed.groundingSources,
       searchQueries: parsed.searchQueries
     };
@@ -1031,6 +1048,9 @@ function normalizeResult2(raw) {
 function hasParsedResponseContent2(rawResponse) {
   return Array.isArray(rawResponse.output) && rawResponse.output.length > 0;
 }
+function extractServedModel2(rawResponse) {
+  return normalizeServedModel(rawResponse.model);
+}
 function reparseStoredResult2(rawResponse) {
   const groundingSources = extractGroundingSourcesFromRaw(rawResponse);
   const searchQueries = extractSearchQueriesFromRaw2(rawResponse);
@@ -1228,6 +1248,7 @@ var openaiAdapter = {
       provider: "openai",
       rawResponse: raw.rawResponse,
       model: raw.model,
+      servedModel: raw.servedModel,
       groundingSources: raw.groundingSources,
       searchQueries: raw.searchQueries
     };
@@ -1365,6 +1386,7 @@ async function executeTrackedQuery3(input) {
       provider: "claude",
       rawResponse,
       model,
+      servedModel: extractServedModel3(rawResponse),
       groundingSources: parsed.groundingSources,
       searchQueries: parsed.searchQueries
     };
@@ -1390,6 +1412,9 @@ function normalizeResult3(raw) {
 function hasParsedResponseContent3(rawResponse) {
   return Array.isArray(rawResponse.content) && rawResponse.content.length > 0;
 }
+function extractServedModel3(rawResponse) {
+  return normalizeServedModel(rawResponse.model);
+}
 function reparseStoredResult3(rawResponse) {
   const groundingSources = extractGroundingSourcesFromRaw2(rawResponse);
   const searchQueries = extractSearchQueriesFromRaw3(rawResponse);
@@ -1589,6 +1614,7 @@ var claudeAdapter = {
       provider: "claude",
       rawResponse: raw.rawResponse,
       model: raw.model,
+      servedModel: raw.servedModel,
       groundingSources: raw.groundingSources,
       searchQueries: raw.searchQueries
     };
@@ -1704,10 +1730,12 @@ async function executeTrackedQuery4(input) {
         ]
       })
     );
+    const rawResponse = responseToRecord4(response);
     return {
       provider: "local",
-      rawResponse: responseToRecord4(response),
+      rawResponse,
       model,
+      servedModel: extractServedModel4(rawResponse),
       groundingSources: [],
       searchQueries: []
     };
@@ -1771,6 +1799,9 @@ function extractDomainMentions(text) {
   }
   return [...domains];
 }
+function extractServedModel4(rawResponse) {
+  return normalizeServedModel(rawResponse.model);
+}
 function responseToRecord4(response) {
   try {
     return JSON.parse(JSON.stringify(response));
@@ -1830,6 +1861,7 @@ var localAdapter = {
       provider: "local",
       rawResponse: raw.rawResponse,
       model: raw.model,
+      servedModel: raw.servedModel,
       groundingSources: raw.groundingSources,
       searchQueries: raw.searchQueries
     };
@@ -2505,6 +2537,7 @@ async function executeTrackedQuery5(input) {
       provider: "perplexity",
       rawResponse,
       model,
+      servedModel: extractServedModel5(rawResponse),
       groundingSources: parsed.groundingSources,
       searchQueries: parsed.searchQueries
     };
@@ -2535,6 +2568,9 @@ function hasParsedResponseContent4(rawResponse) {
   if (!nestedResponse) return false;
   return Array.isArray(nestedResponse.choices) && nestedResponse.choices.length > 0 || Array.isArray(nestedResponse.search_results) && nestedResponse.search_results.length > 0 || Array.isArray(nestedResponse.citations) && nestedResponse.citations.length > 0;
 }
+function extractServedModel5(rawResponse) {
+  return normalizeServedModel(rawResponse.model);
+}
 function reparseStoredResult4(rawResponse) {
   const groundingSources = extractGroundingSources(rawResponse);
   return {
@@ -2725,6 +2761,7 @@ var perplexityAdapter = {
       provider: "perplexity",
       rawResponse: raw.rawResponse,
       model: raw.model,
+      servedModel: raw.servedModel,
       groundingSources: raw.groundingSources,
       searchQueries: raw.searchQueries
     };
@@ -3303,7 +3340,10 @@ var JobRunner = class {
         }
       }
       const projectProviders = providerOverride ?? project.providers;
-      activeProviders = this.registry.getForProject(projectProviders);
+      activeProviders = this.registry.getForProject(projectProviders).map((entry) => {
+        const model = project.providerModels[entry.adapter.name];
+        return model === void 0 ? entry : { ...entry, config: { ...entry.config, model } };
+      });
       if (activeProviders.length === 0) {
         throw new Error("No providers configured. Add at least one provider API key.");
       }
@@ -3406,6 +3446,7 @@ var JobRunner = class {
                 queryText: q.query,
                 provider: providerName,
                 model: raw.model,
+                servedModel: raw.servedModel ?? null,
                 citationState,
                 answerMentioned,
                 answerText: normalized.answerText,
@@ -3416,6 +3457,7 @@ var JobRunner = class {
                 screenshotPath: screenshotRelPath,
                 rawResponse: JSON.stringify({
                   model: raw.model,
+                  servedModel: raw.servedModel ?? null,
                   groundingSources: normalized.groundingSources,
                   searchQueries: normalized.searchQueries,
                   apiResponse: raw.rawResponse
@@ -3430,6 +3472,7 @@ var JobRunner = class {
                 queryText: q.query,
                 provider: providerName,
                 model: raw.model,
+                servedModel: raw.servedModel ?? null,
                 citationState,
                 answerMentioned,
                 answerText: normalized.answerText,
@@ -3439,6 +3482,7 @@ var JobRunner = class {
                 location: runLocation?.label ?? null,
                 rawResponse: JSON.stringify({
                   model: raw.model,
+                  servedModel: raw.servedModel ?? null,
                   groundingSources: normalized.groundingSources,
                   searchQueries: normalized.searchQueries,
                   apiResponse: raw.rawResponse
@@ -4245,9 +4289,8 @@ var OpenAiAdsWriteStatuses = {
   active: "active",
   paused: "paused"
 };
-var OpenAiAdsBillingEventTypes = {
-  impression: "impression"
-};
+var OpenAiAdsBiddingTypes = AdsCampaignBiddingTypes;
+var OpenAiAdsBillingEventTypes = AdsAdGroupBillingEventTypes;
 var OpenAiAdsCreativeTypes = {
   chatCard: "chat_card"
 };
@@ -4284,6 +4327,8 @@ var MAX_BID_MICROS = 1e8;
 var MIN_AD_TITLE_LENGTH = 3;
 var MAX_AD_TITLE_LENGTH = 50;
 var MAX_AD_BODY_LENGTH = 100;
+var MIN_GEO_SEARCH_LIMIT = 1;
+var MAX_GEO_SEARCH_LIMIT = 500;
 function validateApiKey(apiKey) {
   if (!apiKey || typeof apiKey !== "string" || apiKey.trim().length === 0) {
     throw new OpenAiAdsApiError("API key is required and must be a non-empty string", 400);
@@ -4294,6 +4339,15 @@ function validateId(value, label) {
     throw new OpenAiAdsApiError(`${label} is required and must be a non-empty string`, 400);
   }
 }
+function validateGeoSearchLimit(limit) {
+  if (limit === void 0) return;
+  if (!Number.isInteger(limit) || limit < MIN_GEO_SEARCH_LIMIT || limit > MAX_GEO_SEARCH_LIMIT) {
+    throw new OpenAiAdsApiError(
+      `Geo search limit must be an integer between ${MIN_GEO_SEARCH_LIMIT} and ${MAX_GEO_SEARCH_LIMIT}`,
+      400
+    );
+  }
+}
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -4370,10 +4424,34 @@ function validateCampaignTargeting(value) {
     validateId(target.id, "Campaign location id");
   }
 }
+function validateCampaignBidding(request) {
+  const biddingType = request.bidding_type;
+  if (biddingType !== void 0 && biddingType !== OpenAiAdsBiddingTypes.impressions && biddingType !== OpenAiAdsBiddingTypes.clicks) {
+    throw new OpenAiAdsApiError("Campaign bidding_type must be impressions or clicks", 400);
+  }
+  const conversionIds = request.conversion_event_setting_ids;
+  if (conversionIds !== void 0) {
+    if (!Array.isArray(conversionIds)) {
+      throw new OpenAiAdsApiError("Campaign conversion_event_setting_ids must be an array of unique IDs", 400);
+    }
+    for (const conversionId of conversionIds) {
+      validateId(conversionId, "Campaign conversion event setting id");
+    }
+    if (new Set(conversionIds).size !== conversionIds.length) {
+      throw new OpenAiAdsApiError("Campaign conversion_event_setting_ids must contain unique IDs", 400);
+    }
+  }
+  if (biddingType === OpenAiAdsBiddingTypes.clicks && (!Array.isArray(conversionIds) || conversionIds.length === 0)) {
+    throw new OpenAiAdsApiError(
+      "Click campaigns require at least one conversion_event_setting_id",
+      400
+    );
+  }
+}
 function validateBiddingConfig(value) {
   validateRequestObject(value, "Ad group bidding_config");
-  if (value.billing_event_type !== OpenAiAdsBillingEventTypes.impression) {
-    throw new OpenAiAdsApiError("Ad group billing_event_type must be impression", 400);
+  if (value.billing_event_type !== OpenAiAdsBillingEventTypes.impression && value.billing_event_type !== OpenAiAdsBillingEventTypes.click) {
+    throw new OpenAiAdsApiError("Ad group billing_event_type must be impression or click", 400);
   }
   const maxBid = value.max_bid_micros;
   if (!Number.isInteger(maxBid) || maxBid < MIN_BID_MICROS || maxBid > MAX_BID_MICROS) {
@@ -4426,6 +4504,7 @@ function validateCreateCampaignRequest(request) {
   validateCampaignBudget(request.budget);
   validateCampaignTimestamp(request.start_time, "Campaign start_time");
   validateCampaignTimestamp(request.end_time, "Campaign end_time");
+  validateCampaignBidding(request);
   validateCampaignTargeting(request.targeting);
 }
 function validateUpdateCampaignRequest(request) {
@@ -4526,7 +4605,11 @@ async function fetchAllPages(apiKey, path10, queryPairs) {
     after = response.last_id;
   }
   adsClientLog("error", "pagination.cap-reached", { path: path10, pages: OPENAI_ADS_MAX_PAGES, items: items.length });
-  return items;
+  throw new OpenAiAdsApiError(
+    `OpenAI Ads API collection remained incomplete after the ${OPENAI_ADS_MAX_PAGES}-page safety cap`,
+    502,
+    "pagination_limit_exceeded"
+  );
 }
 function insightsPairs(opts) {
   return (opts?.fields ?? []).map((field) => `fields[]=${encodeURIComponent(field)}`);
@@ -4535,6 +4618,22 @@ async function getAdAccount(apiKey) {
   validateApiKey(apiKey);
   return adsFetch(apiKey, "ad_account");
 }
+async function searchGeoLocations(apiKey, query, limit) {
+  validateApiKey(apiKey);
+  validateId(query, "Geo search query");
+  validateGeoSearchLimit(limit);
+  const queryPairs = [`q=${encodeURIComponent(query)}`];
+  if (limit !== void 0) queryPairs.push(`limit=${limit}`);
+  return adsFetch(apiKey, "geo_lookup/search", queryPairs);
+}
+async function listConversionPixels(apiKey) {
+  validateApiKey(apiKey);
+  return fetchAllPages(apiKey, "conversions/pixels", []);
+}
+async function listConversionEventSettings(apiKey) {
+  validateApiKey(apiKey);
+  return fetchAllPages(apiKey, "conversions/event_settings", []);
+}
 async function listCampaigns(apiKey) {
   validateApiKey(apiKey);
   return fetchAllPages(apiKey, "campaigns", []);
@@ -4557,6 +4656,11 @@ async function updateCampaign(apiKey, campaignId, request) {
   validateUpdateCampaignRequest(outbound);
   return adsFetch(apiKey, `campaigns/${encodeURIComponent(campaignId)}`, [], "POST", outbound);
 }
+async function activateCampaign(apiKey, campaignId) {
+  validateApiKey(apiKey);
+  validateId(campaignId, "Campaign id");
+  return adsFetch(apiKey, `campaigns/${encodeURIComponent(campaignId)}/activate`, [], "POST");
+}
 async function pauseCampaign(apiKey, campaignId) {
   validateApiKey(apiKey);
   validateId(campaignId, "Campaign id");
@@ -4585,6 +4689,11 @@ async function updateAdGroup(apiKey, adGroupId, request) {
   validateUpdateAdGroupRequest(outbound);
   return adsFetch(apiKey, `ad_groups/${encodeURIComponent(adGroupId)}`, [], "POST", outbound);
 }
+async function activateAdGroup(apiKey, adGroupId) {
+  validateApiKey(apiKey);
+  validateId(adGroupId, "Ad group id");
+  return adsFetch(apiKey, `ad_groups/${encodeURIComponent(adGroupId)}/activate`, [], "POST");
+}
 async function pauseAdGroup(apiKey, adGroupId) {
   validateApiKey(apiKey);
   validateId(adGroupId, "Ad group id");
@@ -4613,6 +4722,11 @@ async function updateAd(apiKey, adId, request) {
   validateUpdateAdRequest(outbound);
   return adsFetch(apiKey, `ads/${encodeURIComponent(adId)}`, [], "POST", outbound);
 }
+async function activateAd(apiKey, adId) {
+  validateApiKey(apiKey);
+  validateId(adId, "Ad id");
+  return adsFetch(apiKey, `ads/${encodeURIComponent(adId)}/activate`, [], "POST");
+}
 async function pauseAd(apiKey, adId) {
   validateApiKey(apiKey);
   validateId(adId, "Ad id");
@@ -4762,6 +4876,7 @@ async function executeAdsSync(db, runId, projectId, opts) {
           biddingType: campaign.bidding_type,
           dailySpendLimitMicros: campaign.budget?.daily_spend_limit_micros ?? null,
           lifetimeSpendLimitMicros: campaign.budget?.lifetime_spend_limit_micros ?? null,
+          conversionEventSettingIds: campaign.conversion_event_setting_ids ?? [],
           targeting: campaign.targeting,
           upstreamCreatedAt: campaign.created_at,
           upstreamUpdatedAt: campaign.updated_at,
@@ -4824,6 +4939,9 @@ async function executeAdsSync(db, runId, projectId, opts) {
         currencyCode: account.currency_code,
         timezone: account.timezone,
         status: account.status,
+        reviewStatus: account.review?.status ?? null,
+        integrityReviewStatus: account.account_integrity_review?.review?.status ?? null,
+        integrityDecision: account.account_integrity_review?.details?.decision ?? null,
         conversionTrackingConfigured,
         lastSyncedAt: insertNow,
         updatedAt: insertNow
@@ -6783,7 +6901,7 @@ function readStoredGroundingSources(rawResponse) {
   return result;
 }
 async function backfillInsightsCommand(project, opts) {
-  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-FWPXMAVK.js");
+  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-SACHNNCT.js");
   const config = loadConfig();
   const db = createClient(config.database);
   migrate(db);
@@ -8870,14 +8988,22 @@ var AERO_ADS_OPERATOR_MCP_TOOL_NAMES = /* @__PURE__ */ new Set([
   CanonryMcpToolNames.canonry_memory_forget,
   CanonryMcpToolNames.canonry_run_trigger,
   CanonryMcpToolNames.canonry_ads_status,
+  CanonryMcpToolNames.canonry_ads_account,
+  CanonryMcpToolNames.canonry_ads_geo_search,
+  CanonryMcpToolNames.canonry_ads_conversion_pixels,
+  CanonryMcpToolNames.canonry_ads_conversion_event_settings,
   CanonryMcpToolNames.canonry_ads_campaigns,
   CanonryMcpToolNames.canonry_ads_insights,
   CanonryMcpToolNames.canonry_ads_summary,
+  CanonryMcpToolNames.canonry_ads_operations_unresolved,
   CanonryMcpToolNames.canonry_ads_operation_get,
+  CanonryMcpToolNames.canonry_ads_operation_reconcile,
+  CanonryMcpToolNames.canonry_ads_operation_resume_activation,
   CanonryMcpToolNames.canonry_ads_image_upload,
   CanonryMcpToolNames.canonry_ads_campaign_create,
   CanonryMcpToolNames.canonry_ads_campaign_update,
   CanonryMcpToolNames.canonry_ads_campaign_pause,
+  CanonryMcpToolNames.canonry_ads_campaign_activate_tree,
   CanonryMcpToolNames.canonry_ads_ad_group_create,
   CanonryMcpToolNames.canonry_ads_ad_group_update,
   CanonryMcpToolNames.canonry_ads_ad_group_pause,
@@ -11652,38 +11778,130 @@ async function createServer(opts) {
       return removed;
     }
   };
+  const normalizeAdsAccount = (account) => adsAccountDtoSchema.parse({
+    id: account.id,
+    name: account.name,
+    status: account.status,
+    currencyCode: account.currency_code ?? null,
+    timezone: account.timezone ?? null,
+    url: account.url ?? null,
+    reviewStatus: account.review?.status ?? null,
+    integrityReviewStatus: account.account_integrity_review?.review?.status ?? null,
+    integrityDecision: account.account_integrity_review?.details?.decision ?? null
+  });
   const verifyAdsAccount = async (apiKey) => {
-    const account = await getAdAccount(apiKey);
+    const account = normalizeAdsAccount(await getAdAccount(apiKey));
     return {
       id: account.id,
       name: account.name,
       status: account.status,
-      currencyCode: account.currency_code ?? null,
-      timezone: account.timezone ?? null
+      currencyCode: account.currencyCode,
+      timezone: account.timezone,
+      reviewStatus: account.reviewStatus,
+      integrityReviewStatus: account.integrityReviewStatus,
+      integrityDecision: account.integrityDecision
     };
   };
+  const adsReader = {
+    getAccount: async (apiKey) => normalizeAdsAccount(await getAdAccount(apiKey)),
+    searchGeo: async (apiKey, input) => {
+      const response = await searchGeoLocations(apiKey, input.q, input.limit);
+      return adsGeoSearchResponseSchema.parse({
+        count: response.count,
+        query: response.query,
+        results: response.results.map((location) => ({
+          id: location.id,
+          type: location.type,
+          canonicalName: location.canonical_name,
+          countryCode: location.country_code,
+          name: location.name,
+          regionCode: location.region_code
+        }))
+      });
+    },
+    listConversionPixels: async (apiKey) => {
+      const pixels = await listConversionPixels(apiKey);
+      return adsConversionPixelListResponseSchema.parse({
+        pixels: pixels.map((pixel) => ({
+          id: pixel.id,
+          clientType: pixel.client_type,
+          name: pixel.name,
+          pixelId: pixel.pixel_id
+        }))
+      });
+    },
+    listConversionEventSettings: async (apiKey) => {
+      const eventSettings = await listConversionEventSettings(apiKey);
+      return adsConversionEventSettingListResponseSchema.parse({
+        eventSettings: eventSettings.map((eventSetting) => ({
+          id: eventSetting.id,
+          name: eventSetting.name,
+          eventType: eventSetting.event_type,
+          customEventName: eventSetting.custom_event_name,
+          attributionWindowDays: eventSetting.attribution_window_days,
+          adAccountId: eventSetting.ad_account_id,
+          sourceIds: eventSetting.source_ids,
+          sources: eventSetting.sources,
+          archived: eventSetting.archived,
+          version: eventSetting.version
+        }))
+      });
+    }
+  };
   const adsEntityResult = (entity) => ({
     id: entity.id,
+    name: entity.name,
     status: entity.status,
     updatedAt: entity.updated_at,
-    reviewStatus: entity.review_status ?? null
+    reviewStatus: entity.review_status ?? null,
+    creative: typeof entity.creative?.title === "string" && typeof entity.creative.body === "string" && typeof entity.creative.target_url === "string" && typeof entity.creative.file_id === "string" ? {
+      title: entity.creative.title,
+      body: entity.creative.body,
+      targetUrl: entity.creative.target_url,
+      fileId: entity.creative.file_id
+    } : null
+  });
+  const adsCampaignEntityResult = (entity) => ({
+    ...adsEntityResult(entity),
+    description: entity.description,
+    startTime: entity.start_time,
+    endTime: entity.end_time,
+    lifetimeSpendLimitMicros: entity.budget?.lifetime_spend_limit_micros ?? null,
+    locationIds: entity.targeting?.locations?.include?.map((location) => location.id) ?? [],
+    biddingType: entity.bidding_type,
+    conversionEventSettingIds: entity.conversion_event_setting_ids
+  });
+  const adsAdGroupEntityResult = (entity, campaignId) => ({
+    ...adsEntityResult(entity),
+    description: entity.description,
+    campaignId: campaignId ?? null,
+    contextHints: entity.context_hints,
+    maxBidMicros: entity.bidding_config?.max_bid_micros ?? null,
+    billingEventType: entity.bidding_config?.billing_event_type ?? null
+  });
+  const adsAdEntityResult = (entity, adGroupId) => ({
+    ...adsEntityResult(entity),
+    adGroupId: adGroupId ?? null
   });
   const adsOperator = {
     uploadImage: async (apiKey, imageUrl) => {
       const result = await uploadImageFromUrl(apiKey, imageUrl);
       return { fileId: result.file_id };
     },
-    getCampaign: async (apiKey, id) => adsEntityResult(await getCampaign(apiKey, id)),
-    createCampaign: async (apiKey, input) => adsEntityResult(await createCampaign(apiKey, {
+    getCampaign: async (apiKey, id) => adsCampaignEntityResult(await getCampaign(apiKey, id)),
+    listCampaigns: async (apiKey) => (await listCampaigns(apiKey)).map(adsCampaignEntityResult),
+    createCampaign: async (apiKey, input) => adsCampaignEntityResult(await createCampaign(apiKey, {
       name: input.name,
       description: input.description,
       start_time: input.startTime,
       end_time: input.endTime,
       status: OpenAiAdsWriteStatuses.paused,
       budget: { lifetime_spend_limit_micros: input.lifetimeSpendLimitMicros },
+      bidding_type: input.biddingType,
+      conversion_event_setting_ids: input.conversionEventSettingIds,
       targeting: { locations: { include: input.locationIds.map((id) => ({ id })) } }
     })),
-    updateCampaign: async (apiKey, id, input) => adsEntityResult(await updateCampaign(apiKey, id, {
+    updateCampaign: async (apiKey, id, input) => adsCampaignEntityResult(await updateCampaign(apiKey, id, {
       name: input.name,
       description: input.description,
       start_time: input.startTime,
@@ -11691,31 +11909,44 @@ async function createServer(opts) {
       budget: input.lifetimeSpendLimitMicros === void 0 ? void 0 : { lifetime_spend_limit_micros: input.lifetimeSpendLimitMicros },
       targeting: input.locationIds === void 0 ? void 0 : { locations: { include: input.locationIds.map((locationId) => ({ id: locationId })) } }
     })),
-    pauseCampaign: async (apiKey, id) => adsEntityResult(await pauseCampaign(apiKey, id)),
-    getAdGroup: async (apiKey, id) => adsEntityResult(await getAdGroup(apiKey, id)),
-    createAdGroup: async (apiKey, input) => adsEntityResult(await createAdGroup(apiKey, {
+    activateCampaign: async (apiKey, id) => adsCampaignEntityResult(await activateCampaign(apiKey, id)),
+    pauseCampaign: async (apiKey, id) => adsCampaignEntityResult(await pauseCampaign(apiKey, id)),
+    getAdGroup: async (apiKey, id) => adsAdGroupEntityResult(await getAdGroup(apiKey, id)),
+    listAdGroups: async (apiKey, campaignId) => (await listAdGroups(apiKey, campaignId)).map((entity) => adsAdGroupEntityResult(entity, campaignId)),
+    createAdGroup: async (apiKey, input) => adsAdGroupEntityResult(await createAdGroup(apiKey, {
       campaign_id: input.campaignId,
       name: input.name,
       description: input.description,
       context_hints: input.contextHints,
       status: OpenAiAdsWriteStatuses.paused,
       bidding_config: {
-        billing_event_type: OpenAiAdsBillingEventTypes.impression,
+        billing_event_type: input.billingEventType,
         max_bid_micros: input.maxBidMicros
       }
     })),
-    updateAdGroup: async (apiKey, id, input) => adsEntityResult(await updateAdGroup(apiKey, id, {
-      name: input.name,
-      description: input.description,
-      context_hints: input.contextHints,
-      bidding_config: input.maxBidMicros === void 0 ? void 0 : {
-        billing_event_type: OpenAiAdsBillingEventTypes.impression,
-        max_bid_micros: input.maxBidMicros
+    updateAdGroup: async (apiKey, id, input) => {
+      let biddingConfig;
+      if (input.maxBidMicros !== void 0) {
+        if (input.billingEventType === void 0) {
+          throw new Error("Ad group max-bid updates require the current billing event type");
+        }
+        biddingConfig = {
+          billing_event_type: input.billingEventType,
+          max_bid_micros: input.maxBidMicros
+        };
       }
-    })),
-    pauseAdGroup: async (apiKey, id) => adsEntityResult(await pauseAdGroup(apiKey, id)),
-    getAd: async (apiKey, id) => adsEntityResult(await getAd(apiKey, id)),
-    createAd: async (apiKey, input) => adsEntityResult(await createAd(apiKey, {
+      return adsAdGroupEntityResult(await updateAdGroup(apiKey, id, {
+        name: input.name,
+        description: input.description,
+        context_hints: input.contextHints,
+        bidding_config: biddingConfig
+      }));
+    },
+    activateAdGroup: async (apiKey, id) => adsAdGroupEntityResult(await activateAdGroup(apiKey, id)),
+    pauseAdGroup: async (apiKey, id) => adsAdGroupEntityResult(await pauseAdGroup(apiKey, id)),
+    getAd: async (apiKey, id) => adsAdEntityResult(await getAd(apiKey, id)),
+    listAds: async (apiKey, adGroupId) => (await listAds(apiKey, adGroupId)).map((entity) => adsAdEntityResult(entity, adGroupId)),
+    createAd: async (apiKey, input) => adsAdEntityResult(await createAd(apiKey, {
       ad_group_id: input.adGroupId,
       name: input.name,
       status: OpenAiAdsWriteStatuses.paused,
@@ -11727,7 +11958,7 @@ async function createServer(opts) {
         file_id: input.creative.fileId
       }
     })),
-    updateAd: async (apiKey, id, input) => adsEntityResult(await updateAd(apiKey, id, {
+    updateAd: async (apiKey, id, input) => adsAdEntityResult(await updateAd(apiKey, id, {
       name: input.name,
       creative: input.creative ? {
         type: OpenAiAdsCreativeTypes.chatCard,
@@ -11737,7 +11968,8 @@ async function createServer(opts) {
         file_id: input.creative.fileId
       } : void 0
     })),
-    pauseAd: async (apiKey, id) => adsEntityResult(await pauseAd(apiKey, id))
+    activateAd: async (apiKey, id) => adsAdEntityResult(await activateAd(apiKey, id)),
+    pauseAd: async (apiKey, id) => adsAdEntityResult(await pauseAd(apiKey, id))
   };
   const scheduler = new Scheduler(opts.db, {
     onRunCreated: (runId, projectId, providers2, location) => {
@@ -12331,6 +12563,7 @@ async function createServer(opts) {
     },
     adsCredentialStore,
     verifyAdsAccount,
+    adsReader,
     adsOperator,
     onAdsSyncRequested: (runId, projectId) => {
       runAdsSync(runId, projectId);
@@ -12475,6 +12708,9 @@ async function createServer(opts) {
       name: a.name,
       displayName: a.displayName,
       mode: a.mode,
+      modelConfigurable: a.mode === "api",
+      defaultModel: a.modelRegistry.defaultModel,
+      knownModels: a.modelRegistry.knownModels,
       modelValidationPattern: a.modelRegistry.validationPattern,
       modelValidationHint: a.modelRegistry.validationHint
     })),