@canonry/canonry 6.3.0 → 7.0.0

package/assets/index.html

@@ -12,14 +12,14 @@
     <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-DSCun3I9.js"></script>
+    <script type="module" crossorigin src="./assets/index-D9ODLKpH.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vendor-tanstack-ZXXkndVj.js">
     <link rel="modulepreload" crossorigin href="./assets/vendor-radix-twS1M3FF.js">
-    <link rel="modulepreload" crossorigin href="./assets/vendor-recharts-llkUFBGR.js">
+    <link rel="modulepreload" crossorigin href="./assets/vendor-recharts-D-cUuLZo.js">
     <link rel="modulepreload" crossorigin href="./assets/vendor-lucide-N6vOpZmh.js">
     <link rel="modulepreload" crossorigin href="./assets/vendor-markdown-B4giJcws.js">
     <link rel="modulepreload" crossorigin href="./assets/vendor-yaml-GWJz5H2G.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-C17E5ZcA.css">
+    <link rel="stylesheet" crossorigin href="./assets/index-CgT2Btdn.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/{chunk-OTROA7CN.js → chunk-A5PALGQD.js}

@@ -19,21 +19,21 @@ import {
   runWithUsageTags,
   saveConfigPatch,
   sentimentInstallReadiness
-} from "./chunk-ZZEPF3A5.js";
+} from "./chunk-HQJ25LI7.js";
 import {
   computeFactorAverages,
   deleteSiteCrawlGraphLayout,
   persistSiteCrawlGraphLayout,
   prepareSiteCrawlGraphLayout,
   recordedSharePct
-} from "./chunk-FSRVG2H7.js";
+} from "./chunk-RRIZ5AKI.js";
 import {
   CanonryMcpToolNames,
   CliError,
   PACKAGE_VERSION,
   canonryMcpTools,
   isMachineFormat
-} from "./chunk-DERWXLHX.js";
+} from "./chunk-TUHQ5BBQ.js";
 import {
   CC_CACHE_DIR,
   DUCKDB_SPEC,
@@ -214,7 +214,7 @@ import {
   siteLivenessState,
   toAlertView,
   usageCounters
-} from "./chunk-QVGG76UW.js";
+} from "./chunk-EZ54X4XH.js";
 import {
   AGENT_MEMORY_VALUE_MAX_BYTES,
   AGENT_NONE,
@@ -330,6 +330,7 @@ import {
   effectiveBrandNames,
   effectiveDomains,
   embedClientConfigForRequest,
+  embedProjectTabsError,
   extractProviderHttpStatus,
   factorStatusFromScore,
   filterCapturedCitedUrls,
@@ -420,7 +421,7 @@ import {
   visibilityReportRequestSchema,
   winnabilityClassLabel,
   withRetry
-} from "./chunk-EV5G5QRR.js";
+} from "./chunk-OOUDIVIU.js";
 
 // src/runtime-context.ts
 function cliRuntimeContext(env = process.env, stdio = process) {
@@ -3941,14 +3942,17 @@ var SentimentWorker = class {
     this.reconcile();
     const gate = this.repository.dispatchGate({ now: this.now(), credentialFingerprint: credentialFingerprint(config.apiKey) });
     if (gate === "closed") return 0;
+    const used = this.repository.recentDispatch(this.now());
+    if (used.tokens >= config.maxInputTokensPerMinute) return 0;
+    const allowed = Math.min(gate === "probe" ? 1 : config.maxConcurrency, config.maxRequestsPerMinute - used.requests);
     const claims = [];
-    for (let index = 0; index < (gate === "probe" ? 1 : config.maxConcurrency); index++) {
+    for (let index = 0; index < allowed; index++) {
       const claim = this.repository.claim({ owner: randomUUID(), now: this.now(), leaseMs: 12e4, maxConcurrent: config.maxConcurrency });
       if (!claim) break;
       claims.push(claim);
     }
-    await Promise.all(claims.map((work) => this.execute(work)));
-    return claims.length;
+    const outcomes = await Promise.all(claims.map((work) => this.execute(work)));
+    return outcomes.filter((outcome) => outcome !== "released").length;
   }
   async execute(work) {
     const owner = work.leaseOwner;
@@ -3990,6 +3994,11 @@ var SentimentWorker = class {
     }
     const attempt = this.repository.startAttempt({ workItemId: work.id, owner, requestedModel: input.definition.requestedModel, now: this.now(), estimatedInputTokens: estimate, maxRequestsPerMinute: config.maxRequestsPerMinute, maxAttempts: config.maxAttempts, maxInputTokensPerMinute: config.maxInputTokensPerMinute });
     if (!attempt) {
+      const used = this.repository.recentDispatch(this.now());
+      if (used.requests >= config.maxRequestsPerMinute || used.tokens + estimate > config.maxInputTokensPerMinute) {
+        this.repository.releaseWork({ workItemId: work.id, owner, now: this.now() });
+        return "released";
+      }
       this.repository.failWork({ workItemId: work.id, owner, now: this.now(), errorCode: "RATE_LIMIT_WAIT", retryAt: new Date(Date.parse(this.now()) + 6e4).toISOString() });
       return;
     }
@@ -4030,6 +4039,28 @@ var SentimentWorker = class {
     }
   }
 };
+function createSentimentPoller(tick, onError, schedule = setImmediate) {
+  let inFlight2 = null;
+  let stopped = false;
+  const poll = () => {
+    if (inFlight2 || stopped) return;
+    inFlight2 = tick().catch(() => {
+      onError();
+      return 0;
+    }).then((claimed) => {
+      inFlight2 = null;
+      if (claimed > 0 && !stopped) schedule(poll);
+    });
+  };
+  return {
+    poll,
+    /** The tick in flight, if any. */
+    settled: () => inFlight2,
+    stop: () => {
+      stopped = true;
+    }
+  };
+}
 
 // src/sentiment-config.ts
 import fs2 from "fs";
@@ -7392,7 +7423,7 @@ var museAdapter = {
 
 // src/embed.ts
 var DEFAULT_EMBED_PROJECT_TABS = ["overview"];
-var SERVER_ENFORCED_EMBED_PROJECT_TABS = ["overview", "technical-aeo", "report"];
+var SERVER_ENFORCED_EMBED_PROJECT_TABS = ["overview", "technical-aeo"];
 function unsupportedEmbedProjectTabs(projectTabs) {
   if (!projectTabs) return [];
   const supported = new Set(SERVER_ENFORCED_EMBED_PROJECT_TABS);
@@ -7407,6 +7438,8 @@ function resolveEmbedConfig(env, config) {
   const views = normalizeIdTokens(rawViews);
   const rawProjectTabs = env.CANONRY_EMBED_PROJECT_TABS !== void 0 ? splitList(env.CANONRY_EMBED_PROJECT_TABS) : splitList(embed?.projectTabs);
   const projectTabs = normalizeIdTokens(rawProjectTabs) ?? (enabled ? DEFAULT_EMBED_PROJECT_TABS : void 0);
+  const projectTabsError = enabled ? embedProjectTabsError(projectTabs) : void 0;
+  if (projectTabsError) throw new Error(projectTabsError);
   return {
     enabled,
     allowedOrigins,
@@ -7952,7 +7985,7 @@ function nonBlank(value) {
   return trimmed ? trimmed : void 0;
 }
 function resolveBuildCommit(env = process.env) {
-  const embedded = true ? "a0351a3c7ac5eb8e0e4028ee004ddd5a12874575" : void 0;
+  const embedded = true ? "49491274532e363f77adf0d73eccaac7a5359a4c" : void 0;
   return nonBlank(embedded) ?? nonBlank(env.CANONRY_COMMIT);
 }
 function resolveInstanceIdentity(env = process.env) {
@@ -14765,7 +14798,7 @@ function readStoredGroundingSources(rawResponse) {
   return result2;
 }
 async function backfillInsightsCommand(project, opts) {
-  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-5J36RBEM.js");
+  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-ZVKZLLKL.js");
   const config = loadConfig();
   const db = createClient(config.database);
   migrate(db);
@@ -22167,6 +22200,7 @@ function createGoogleMarketingConfigCredentialStore(input) {
   };
 }
 async function createServer(opts) {
+  const embed = resolveEmbedConfig(process.env, opts.config);
   const operatorApiKeyIds = resolveOperatorApiKeyIds(process.env);
   const dashboardManagedRunKinds = resolveDashboardManagedRunKinds(process.env, opts.config);
   const operationalLogs = new OperationalLogStore(opts.db, {
@@ -22995,7 +23029,6 @@ async function createServer(opts) {
   const rawBasePath = process.env.CANONRY_BASE_PATH ?? opts.config.basePath;
   const normalizedBasePath = rawBasePath ? "/" + rawBasePath.replace(/^\//, "").replace(/\/?$/, "/") : void 0;
   const basePath = normalizedBasePath === "/" ? void 0 : normalizedBasePath;
-  const embed = resolveEmbedConfig(process.env, opts.config);
   const embedCsp = embed.enabled ? frameAncestorsHeaderValue(embed.allowedOrigins) : void 0;
   const unsupportedProjectTabs = unsupportedEmbedProjectTabs(embed.projectTabs);
   if (embed.enabled && unsupportedProjectTabs.length > 0) {
@@ -23277,16 +23310,13 @@ async function createServer(opts) {
       return built.ok ? { ok: true, estimatedInputTokens: built.estimate.inputTokens } : built;
     }
   });
-  let sentimentTick = null;
-  const pollSentiment = () => {
-    if (sentimentTick) return;
-    sentimentTick = sentimentWorker.tick().catch(() => {
+  const sentimentPoller = createSentimentPoller(
+    () => sentimentWorker.tick(),
+    () => {
       log24.error("sentiment.worker-failed", { reason: "Stored sentiment worker could not finish its tick." });
-      return 0;
-    }).finally(() => {
-      sentimentTick = null;
-    });
-  };
+    }
+  );
+  const pollSentiment = sentimentPoller.poll;
   let sentimentTimer;
   runCoordinator.onSentimentCompleted = async () => {
     pollSentiment();
@@ -23298,7 +23328,8 @@ async function createServer(opts) {
   });
   app.addHook("onClose", async () => {
     clearInterval(sentimentTimer);
-    await sentimentTick;
+    sentimentPoller.stop();
+    await sentimentPoller.settled();
   });
   const providerModelCatalog = createProviderModelCatalog(registry);
   await app.register(apiRoutes, {
@@ -23989,6 +24020,8 @@ async function createServer(opts) {
       }
       if (embed.enabled) {
         const embedClient = embedClientConfigForRequest(embed, projectTabsOverride, themeOverride, renderTokenOverride);
+        const projectTabsError = embedProjectTabsError(embedClient?.projectTabs);
+        if (projectTabsError) throw validationError(projectTabsError);
         if (embedClient) clientConfig.embed = embedClient;
       }
       const configScript = `<script>window.__CANONRY_CONFIG__=${serializeForInlineScript(clientConfig)}</script>`;