@canonry/canonry 6.3.0 → 6.3.1

package/dist/{chunk-OTROA7CN.js → chunk-4WZUR7XX.js}

@@ -26,7 +26,7 @@ import {
   persistSiteCrawlGraphLayout,
   prepareSiteCrawlGraphLayout,
   recordedSharePct
-} from "./chunk-FSRVG2H7.js";
+} from "./chunk-5FYTFE5T.js";
 import {
   CanonryMcpToolNames,
   CliError,
@@ -214,7 +214,7 @@ import {
   siteLivenessState,
   toAlertView,
   usageCounters
-} from "./chunk-QVGG76UW.js";
+} from "./chunk-7CVTTQRV.js";
 import {
   AGENT_MEMORY_VALUE_MAX_BYTES,
   AGENT_NONE,
@@ -3941,14 +3941,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 +3993,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 +4038,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";
@@ -7952,7 +7982,7 @@ function nonBlank(value) {
   return trimmed ? trimmed : void 0;
 }
 function resolveBuildCommit(env = process.env) {
-  const embedded = true ? "a0351a3c7ac5eb8e0e4028ee004ddd5a12874575" : void 0;
+  const embedded = true ? "a9545eefb45af8bb1a00366b6e75ce25bb3f4c2b" : void 0;
   return nonBlank(embedded) ?? nonBlank(env.CANONRY_COMMIT);
 }
 function resolveInstanceIdentity(env = process.env) {
@@ -14765,7 +14795,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-SYISPW25.js");
   const config = loadConfig();
   const db = createClient(config.database);
   migrate(db);
@@ -23277,16 +23307,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 +23325,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, {

package/dist/{chunk-FSRVG2H7.js → chunk-5FYTFE5T.js}

@@ -5,7 +5,7 @@ import {
   siteCrawlGraphNodes,
   siteCrawlPages,
   siteCrawlSnapshots
-} from "./chunk-QVGG76UW.js";
+} from "./chunk-7CVTTQRV.js";
 import {
   SITE_CRAWL_GRAPH_MAX_EDGES,
   SITE_CRAWL_GRAPH_MAX_NODES,

package/dist/{chunk-QVGG76UW.js → chunk-7CVTTQRV.js}

@@ -9003,6 +9003,10 @@ function cancelProject(db, projectId, now, reason) {
   )).run();
   recountJobs(db, affected, now);
 }
+function dispatchedInLastMinute(db, now) {
+  const since = new Date(Date.parse(now) - 6e4).toISOString();
+  return db.select({ requests: sql4`count(*)`, tokens: sql4`coalesce(sum(${sentimentAttempts.estimatedInputTokens}), 0)` }).from(sentimentAttempts).where(gt(sentimentAttempts.dispatchedAt, since)).get();
+}
 var SentimentRepository = class {
   constructor(db) {
     this.db = db;
@@ -9211,6 +9215,10 @@ var SentimentRepository = class {
       return claimed;
     }, { behavior: "immediate" });
   }
+  /** Requests and estimated input tokens dispatched in the minute before `now`: the window `startAttempt` enforces. */
+  recentDispatch(now) {
+    return dispatchedInLastMinute(this.db, now);
+  }
   startAttempt(input) {
     return this.db.transaction((tx) => {
       const work = tx.select().from(sentimentWorkItems).where(and(
@@ -9225,8 +9233,7 @@ var SentimentRepository = class {
       if (input.maxAttempts !== void 0 && work.attemptCount - work.attemptBudgetStart >= input.maxAttempts) return void 0;
       const estimate = input.estimatedInputTokens ?? 0;
       if (!Number.isSafeInteger(estimate) || estimate < 0) throw new Error("Invalid sentiment token estimate");
-      const since = new Date(Date.parse(input.now) - 6e4).toISOString();
-      const used = tx.select({ requests: sql4`count(*)`, tokens: sql4`coalesce(sum(${sentimentAttempts.estimatedInputTokens}), 0)` }).from(sentimentAttempts).where(gt(sentimentAttempts.dispatchedAt, since)).get();
+      const used = dispatchedInLastMinute(tx, input.now);
       if (input.maxRequestsPerMinute !== void 0 && used.requests >= input.maxRequestsPerMinute) return void 0;
       if (input.maxInputTokensPerMinute !== void 0 && used.tokens + estimate > input.maxInputTokensPerMinute) return void 0;
       const attemptNumber = work.attemptCount + 1;
@@ -9301,6 +9308,14 @@ var SentimentRepository = class {
       return true;
     }, { behavior: "immediate" });
   }
+  /** Hand claimed work back to the queue untouched: no error, no retry time, no attempt counted. */
+  releaseWork(input) {
+    return this.db.transaction((tx) => {
+      const changed = tx.update(sentimentWorkItems).set({ status: "pending", leaseOwner: null, leaseExpiresAt: null, updatedAt: input.now }).where(and(eq2(sentimentWorkItems.id, input.workItemId), eq2(sentimentWorkItems.leaseOwner, input.owner), eq2(sentimentWorkItems.status, "running"))).returning().all();
+      if (changed.length > 0) shiftJobs(tx, changed[0].id, "running", "pending", input.now);
+      return changed.length > 0;
+    }, { behavior: "immediate" });
+  }
   failWork(input) {
     return this.db.transaction((tx) => {
       const changed = tx.update(sentimentWorkItems).set({

package/dist/cli.js

@@ -35,7 +35,7 @@ import {
   trackCliCommandFinished,
   trackEvent,
   waitForServerRuntimeStartup
-} from "./chunk-OTROA7CN.js";
+} from "./chunk-4WZUR7XX.js";
 import {
   autoSyncSkills,
   formatAutoSyncNotice
@@ -62,7 +62,7 @@ import {
   trustedProxiesProblem,
   trustedProxyProblem
 } from "./chunk-RB2F4D3Z.js";
-import "./chunk-FSRVG2H7.js";
+import "./chunk-5FYTFE5T.js";
 import {
   CliError,
   EXIT_SYSTEM_ERROR,
@@ -90,7 +90,7 @@ import {
   queries,
   renderReportHtml,
   runs
-} from "./chunk-QVGG76UW.js";
+} from "./chunk-7CVTTQRV.js";
 import {
   AdsDeliverySnapshotStatuses,
   AdsHistoricalCampaignRollupStatuses,
@@ -734,7 +734,7 @@ function parseDemoTrustedProxies(values) {
 async function demoCommand(options) {
   const { host, port } = parseDemoListenOptions(options);
   const trustProxy = parseDemoTrustedProxies(options.trustProxy);
-  const { createDemoServer } = await import("./demo-server-5MNLI6GC.js");
+  const { createDemoServer } = await import("./demo-server-AIFR77TP.js");
   const app = await createDemoServer({ trustProxy });
   let stopping = false;
   const stop = () => {

package/dist/{demo-server-5MNLI6GC.js → demo-server-AIFR77TP.js}

@@ -5,7 +5,7 @@ import {
   computeFactorAverages,
   layoutSiteCrawlGraphInput,
   persistSiteCrawlGraphLayout
-} from "./chunk-FSRVG2H7.js";
+} from "./chunk-5FYTFE5T.js";
 import {
   PACKAGE_VERSION,
   canonryMcpTools
@@ -85,7 +85,7 @@ import {
   siteCrawlPages,
   siteCrawlSnapshots,
   trafficSources
-} from "./chunk-QVGG76UW.js";
+} from "./chunk-7CVTTQRV.js";
 import {
   RunKinds,
   SiteCrawlFetchStates,

package/dist/index.js

@@ -3,13 +3,13 @@ import {
   createGoogleMarketingCredentialStore,
   createGoogleMarketingRuntime,
   createServer
-} from "./chunk-OTROA7CN.js";
+} from "./chunk-4WZUR7XX.js";
 import {
   loadConfig
 } from "./chunk-ZZEPF3A5.js";
-import "./chunk-FSRVG2H7.js";
+import "./chunk-5FYTFE5T.js";
 import "./chunk-DERWXLHX.js";
-import "./chunk-QVGG76UW.js";
+import "./chunk-7CVTTQRV.js";
 import "./chunk-EV5G5QRR.js";
 export {
   GoogleMarketingRuntimeError,

package/dist/{intelligence-service-5J36RBEM.js → intelligence-service-SYISPW25.js}

@@ -1,7 +1,7 @@
 import {
   HISTORY_WINDOW_RUNS,
   IntelligenceService
-} from "./chunk-QVGG76UW.js";
+} from "./chunk-7CVTTQRV.js";
 import "./chunk-EV5G5QRR.js";
 export {
   HISTORY_WINDOW_RUNS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonry/canonry",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "type": "module",
   "description": "Self-hosted AI visibility (AEO) platform: track how ChatGPT, Claude, Gemini, and Perplexity cite your domain, join it with Search Console, GA4, server-side traffic, and paid media, and fix what you find through agent tools (CLI, REST, MCP). Local SQLite.",
   "keywords": [
@@ -87,32 +87,32 @@
     "tsx": "^4.19.0",
     "@ainyc/canonry-web": "0.0.0",
     "@ainyc/canonry-api-routes": "0.0.0",
-    "@ainyc/canonry-contracts": "0.0.0",
-    "@ainyc/canonry-config": "0.0.0",
     "@ainyc/canonry-api-client": "0.0.0",
+    "@ainyc/canonry-config": "0.0.0",
+    "@ainyc/canonry-contracts": "0.0.0",
     "@ainyc/canonry-db": "0.0.0",
-    "@ainyc/canonry-integration-bing": "0.0.0",
-    "@ainyc/canonry-integration-cloudflare-queue": "0.0.0",
     "@ainyc/canonry-integration-cloud-run": "0.0.0",
+    "@ainyc/canonry-integration-cloudflare-queue": "0.0.0",
+    "@ainyc/canonry-integration-bing": "0.0.0",
     "@ainyc/canonry-integration-cloudflare-worker": "0.0.0",
-    "@ainyc/canonry-integration-commoncrawl": "0.0.0",
+    "@ainyc/canonry-integration-google-business-profile": "0.0.0",
     "@ainyc/canonry-integration-google": "0.0.0",
     "@ainyc/canonry-integration-google-ads": "0.0.0",
-    "@ainyc/canonry-integration-google-business-profile": "0.0.0",
-    "@ainyc/canonry-integration-google-places": "0.0.0",
+    "@ainyc/canonry-integration-commoncrawl": "0.0.0",
     "@ainyc/canonry-integration-google-tag-manager": "0.0.0",
+    "@ainyc/canonry-integration-google-places": "0.0.0",
+    "@ainyc/canonry-integration-openai-ads": "0.0.0",
     "@ainyc/canonry-integration-traffic": "0.0.0",
     "@ainyc/canonry-intelligence": "0.0.0",
-    "@ainyc/canonry-integration-openai-ads": "0.0.0",
+    "@ainyc/canonry-provider-cdp": "0.0.0",
     "@ainyc/canonry-integration-wordpress": "0.0.0",
-    "@ainyc/canonry-provider-claude": "0.0.0",
     "@ainyc/canonry-provider-gemini": "0.0.0",
+    "@ainyc/canonry-provider-claude": "0.0.0",
     "@ainyc/canonry-provider-local": "0.0.0",
-    "@ainyc/canonry-provider-muse": "0.0.0",
-    "@ainyc/canonry-provider-openai": "0.0.0",
     "@ainyc/canonry-provider-perplexity": "0.0.0",
     "@ainyc/canonry-integration-typesafe": "0.0.0",
-    "@ainyc/canonry-provider-cdp": "0.0.0"
+    "@ainyc/canonry-provider-muse": "0.0.0",
+    "@ainyc/canonry-provider-openai": "0.0.0"
   },
   "scripts": {
     "build": "pnpm run build:cli && pnpm run build:web",