@canonry/canonry 5.30.0 → 5.30.1

package/dist/{chunk-T3MTYL7I.js → chunk-LLVE7B3V.js}

@@ -7136,7 +7136,9 @@ async function executeTrackedQuery6(input) {
       servedModel: extractServedModel6(rawResponse),
       groundingSources: parsed.groundingSources,
       searchQueries: parsed.searchQueries,
-      retrievalStatus: parsed.retrievalStatus
+      retrievalStatus: parsed.retrievalStatus,
+      usage: extractUsage(rawResponse),
+      stopReason: extractStopReason(rawResponse)
     };
   } catch (err) {
     throw new Error(`[provider-muse] ${describeError(err)}`);
@@ -7145,6 +7147,26 @@ async function executeTrackedQuery6(input) {
 function extractServedModel6(rawResponse) {
   return normalizeServedModel(rawResponse.model);
 }
+function extractUsage(rawResponse) {
+  const usage = asRecord(rawResponse.usage);
+  if (!usage) return void 0;
+  const inputTokens = usageCount(usage.input_tokens);
+  const cachedInputTokens = usageCount(asRecord(usage.input_tokens_details)?.cached_tokens);
+  const output = Array.isArray(rawResponse.output) ? rawResponse.output : [];
+  return {
+    inputTokens: Math.max(0, inputTokens - cachedInputTokens),
+    cachedInputTokens,
+    cacheWriteTokens: 0,
+    outputTokens: usageCount(usage.output_tokens),
+    searchCount: output.filter((item) => asRecord(item)?.type === "web_search_call").length
+  };
+}
+function extractStopReason(rawResponse) {
+  const reason = asRecord(rawResponse.incomplete_details)?.reason;
+  if (typeof reason === "string" && reason.length > 0) return reason;
+  const status = rawResponse.status;
+  return typeof status === "string" && status.length > 0 ? status : void 0;
+}
 function normalizeResult7(raw) {
   return reparseStoredResult5(raw.rawResponse);
 }
@@ -7808,7 +7830,7 @@ function nonBlank(value) {
   return trimmed ? trimmed : void 0;
 }
 function resolveBuildCommit(env = process.env) {
-  const embedded = true ? "927559d4c19997a79d58c7c1c9e3d9b491a3880b" : void 0;
+  const embedded = true ? "b528a187897c1efc97f0211c8824961fefac800e" : void 0;
   return nonBlank(embedded) ?? nonBlank(env.CANONRY_COMMIT);
 }
 function resolveInstanceIdentity(env = process.env) {
@@ -8709,7 +8731,7 @@ var JobRunner = class {
         for (const provider of apiProviders) {
           if (frozenModes[providerKey(provider)] !== ProviderDispatchModes.batch) continue;
           if (adapterSupportsBatch(provider.adapter)) batchProviders.add(provider.adapter.name);
-          else log2.warn("run.batch-unsupported", { runId, providerName: provider.adapter.name });
+          else log2.warn("run.batch-unsupported", { runId, provider: provider.adapter.name });
         }
         log2.info("run.plan-dispatch", {
           runId,
@@ -9128,7 +9150,7 @@ var JobRunner = class {
           location: unit.context ?? void 0
         }, { ...config, model });
       } catch (err) {
-        log2.warn("batch.build-failed", { runId: ctx.runId, providerName, executionId: unit.executionId, error: describeError(err) });
+        log2.warn("batch.build-failed", { runId: ctx.runId, provider: providerName, executionId: unit.executionId, error: describeError(err) });
         syncUnits.push(unit);
         continue;
       }
@@ -9141,7 +9163,7 @@ var JobRunner = class {
     for (const [model, lines] of linesByModel) {
       const { chunks, oversized } = chunkBatchLines(lines, maxRequests, capability.maxBytesPerBatch);
       if (oversized.length > 0) {
-        log2.warn("batch.line-too-large", { runId: ctx.runId, providerName, model, count: oversized.length, maxBytes: capability.maxBytesPerBatch });
+        log2.warn("batch.line-too-large", { runId: ctx.runId, provider: providerName, model, count: oversized.length, maxBytes: capability.maxBytesPerBatch });
         syncUnits.push(...oversized.map((line) => line.unit));
       }
       for (const chunk of chunks) {
@@ -9201,7 +9223,7 @@ var JobRunner = class {
         }
       });
     } catch (err) {
-      log2.warn("batch.ledger-failed", { runId: ctx.runId, providerName, requests: lines.length, error: describeError(err) });
+      log2.warn("batch.ledger-failed", { runId: ctx.runId, provider: providerName, requests: lines.length, error: describeError(err) });
       return lines.map((line) => line.unit);
     }
     ctx.batchRowIds.push(rowId);
@@ -9220,7 +9242,7 @@ var JobRunner = class {
           txDb.update(providerBatches).set({ quotaReleased: lines.length, updatedAt: at }).where(eq3(providerBatches.id, rowId)).run();
           if (!sweepLive) releaseDailyQueryQuota(txDb, { scope: reservation.scope, period: reservation.period, count: lines.length });
         });
-        log2.warn("batch.submit-refused", { runId: ctx.runId, providerName, batchId: rowId, requests: lines.length, error: message });
+        log2.warn("batch.submit-refused", { runId: ctx.runId, provider: providerName, batchId: rowId, requests: lines.length, error: message });
         if (!sweepLive) return [];
         this.countDispatched(ctx.providerDispatchCounts, providerName, -lines.length);
         return lines.map((line) => line.unit);
@@ -9230,7 +9252,7 @@ var JobRunner = class {
         error: `The provider batch of ${lines.length} answer(s) may or may not have been created, so it was not resubmitted and its answers were not recorded: ${message}`,
         updatedAt: at
       }).where(and3(eq3(providerBatches.id, rowId), eq3(providerBatches.status, ProviderBatchStatuses.submitting))).run();
-      log2.error("batch.submit-unknown", { runId: ctx.runId, providerName, batchId: rowId, requests: lines.length, error: message });
+      log2.error("batch.submit-unknown", { runId: ctx.runId, provider: providerName, batchId: rowId, requests: lines.length, error: message });
       return [];
     }
     const submitted = /* @__PURE__ */ new Date();
@@ -9246,7 +9268,7 @@ var JobRunner = class {
       await this.cancelAtProvider([{ id: rowId, provider: providerName, providerBatchId: result2.providerBatchId }]);
       return [];
     }
-    log2.info("batch.submitted", { runId: ctx.runId, providerName, batchId: rowId, providerBatchId: result2.providerBatchId, model, requests: lines.length });
+    log2.info("batch.submitted", { runId: ctx.runId, provider: providerName, batchId: rowId, providerBatchId: result2.providerBatchId, model, requests: lines.length });
     return [];
   }
   countDispatched(counts, providerName, sent) {
@@ -9287,14 +9309,14 @@ var JobRunner = class {
       if (!row.providerBatchId) continue;
       const registered = this.registry.get(row.provider);
       if (!registered?.adapter.batch) {
-        log2.warn("batch.cancel-unavailable", { batchId: row.id, providerName: row.provider });
+        log2.warn("batch.cancel-unavailable", { batchId: row.id, provider: row.provider });
         continue;
       }
       try {
         await registered.adapter.batch.cancel(row.providerBatchId, registered.config);
-        log2.info("batch.cancelled", { batchId: row.id, providerName: row.provider, providerBatchId: row.providerBatchId });
+        log2.info("batch.cancelled", { batchId: row.id, provider: row.provider, providerBatchId: row.providerBatchId });
       } catch (err) {
-        log2.warn("batch.cancel-failed", { batchId: row.id, providerName: row.provider, error: describeError(err) });
+        log2.warn("batch.cancel-failed", { batchId: row.id, provider: row.provider, error: describeError(err) });
       }
     }
   }
@@ -9355,7 +9377,7 @@ var JobRunner = class {
       for await (const line of capability.results(batch.providerBatchId, registered.config)) {
         const request = requests.get(line.customId);
         if (!request) {
-          log2.warn("batch.unknown-line", { batchId: batch.id, providerName: batch.provider, customId: line.customId });
+          log2.warn("batch.unknown-line", { batchId: batch.id, provider: batch.provider, customId: line.customId });
           continue;
         }
         if (request.outcome !== null) continue;
@@ -9382,7 +9404,7 @@ var JobRunner = class {
       raw = adapter.parseTrackedQueryResponse(line.body, resolveProviderModel(adapter.name, request.requestedModel));
     } catch (err) {
       const error = describeError(err);
-      log2.warn("batch.parse-failed", { runId: batch.runId, batchId: batch.id, providerName: batch.provider, executionId: request.executionId, error });
+      log2.warn("batch.parse-failed", { runId: batch.runId, batchId: batch.id, provider: batch.provider, executionId: request.executionId, error });
       return { outcome: ProviderBatchRequestOutcomes.parse_failed, error };
     }
     const unit = {
@@ -9425,7 +9447,7 @@ var JobRunner = class {
         updatedAt: at
       }).where(and3(eq3(providerBatches.id, batch.id), eq3(providerBatches.status, ProviderBatchStatuses.ended))).run();
       const { recordedCount: recorded, notRecorded } = tally;
-      log2.info("batch.ingested", { runId: batch.runId, batchId: batch.id, providerName: batch.provider, recorded, notRecorded, released });
+      log2.info("batch.ingested", { runId: batch.runId, batchId: batch.id, provider: batch.provider, recorded, notRecorded, released });
       return { kind: "ingested", recorded, notRecorded, released };
     });
   }
@@ -9455,7 +9477,7 @@ var JobRunner = class {
     log2.warn("batch.abandoned-unreadable", {
       runId: batch.runId,
       batchId: batch.id,
-      providerName: batch.provider,
+      provider: batch.provider,
       recorded: tally.recordedCount,
       unread: batch.requestCount - tally.ingestedCount,
       released
@@ -15588,8 +15610,7 @@ var Scheduler = class {
         log15.warn("run.dispatch-sync-fallback", {
           runId,
           projectName: project.name,
-          // Not `provider`: the log redactor drops that key as a payload graph.
-          providerName: provider,
+          provider,
           reason,
           message: `${provider} is set to batch for this project but runs sync on this sweep: ${describeBatchIneligibility(provider, reason)}`
         });
@@ -15674,7 +15695,7 @@ var ProviderBatchPoller = class {
       try {
         if (await this.advance(row)) settledRuns.set(row.runId, row.projectId);
       } catch (err) {
-        log17.warn("batch.advance-failed", { batchId: row.id, runId: row.runId, providerName: row.provider, error: describeError(err) });
+        log17.warn("batch.advance-failed", { batchId: row.id, runId: row.runId, provider: row.provider, error: describeError(err) });
         this.reschedule(row.id, null);
       }
     }
@@ -15714,10 +15735,10 @@ var ProviderBatchPoller = class {
           return ended ? this.ingest({ ...row, status: ProviderBatchStatuses.ended, resultsExpireAt: poll.resultsExpireAt ?? null }) : false;
         }
       } catch (err) {
-        log17.warn("batch.poll-failed", { batchId: row.id, runId: row.runId, providerName: row.provider, error: describeError(err) });
+        log17.warn("batch.poll-failed", { batchId: row.id, runId: row.runId, provider: row.provider, error: describeError(err) });
       }
     } else {
-      log17.warn("batch.poll-unavailable", { batchId: row.id, runId: row.runId, providerName: row.provider });
+      log17.warn("batch.poll-unavailable", { batchId: row.id, runId: row.runId, provider: row.provider });
     }
     this.reschedule(row.id, status);
     return this.enforceDeadline(row, registered);
@@ -15739,12 +15760,12 @@ var ProviderBatchPoller = class {
         isNull3(providerBatches.cancelRequestedAt)
       )).run().changes === 1;
       if (!claimed) return false;
-      log17.warn("batch.deadline-passed", { batchId: row.id, runId: row.runId, providerName: row.provider, deadlineAt: row.deadlineAt });
+      log17.warn("batch.deadline-passed", { batchId: row.id, runId: row.runId, provider: row.provider, deadlineAt: row.deadlineAt });
       if (registered?.adapter.batch && row.providerBatchId) {
         try {
           await registered.adapter.batch.cancel(row.providerBatchId, registered.config);
         } catch (err) {
-          log17.warn("batch.cancel-failed", { batchId: row.id, providerName: row.provider, error: describeError(err) });
+          log17.warn("batch.cancel-failed", { batchId: row.id, provider: row.provider, error: describeError(err) });
         }
       }
       return false;
@@ -15756,7 +15777,7 @@ var ProviderBatchPoller = class {
       updatedAt: at
     }).where(and17(eq19(providerBatches.id, row.id), eq19(providerBatches.status, ProviderBatchStatuses.submitted))).run().changes === 1;
     this.schedule.delete(row.id);
-    if (gaveUp) log17.warn("batch.abandoned-after-deadline", { batchId: row.id, runId: row.runId, providerName: row.provider });
+    if (gaveUp) log17.warn("batch.abandoned-after-deadline", { batchId: row.id, runId: row.runId, provider: row.provider });
     return gaveUp;
   }
   async ingest(row) {
@@ -15765,7 +15786,7 @@ var ProviderBatchPoller = class {
       return result2.kind !== "skipped";
     } catch (err) {
       const error = describeError(err);
-      log17.warn("batch.ingest-failed", { batchId: row.id, runId: row.runId, providerName: row.provider, error });
+      log17.warn("batch.ingest-failed", { batchId: row.id, runId: row.runId, provider: row.provider, error });
       const now = this.now();
       const unreadable = row.resultsExpireAt !== null && now >= Date.parse(row.resultsExpireAt);
       if (unreadable || now >= Date.parse(row.deadlineAt) + PROVIDER_BATCH_CANCEL_GRACE_MS) {
@@ -21890,7 +21911,7 @@ async function createServer(opts) {
   }
   for (const name of providersWithUnsupportedBatch(providers, (provider) => adapterMap[provider])) {
     log24.warn("provider.batch.unsupported", {
-      providerName: name,
+      provider: name,
       message: `providers.${name}.batch.enabled is true, but the ${name} adapter has no batch API; its sweeps run sync.`
     });
   }

package/dist/cli.js

@@ -35,7 +35,7 @@ import {
   trackCliCommandFinished,
   trackEvent,
   waitForServerRuntimeStartup
-} from "./chunk-T3MTYL7I.js";
+} from "./chunk-LLVE7B3V.js";
 import {
   autoSyncSkills,
   formatAutoSyncNotice

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   createGoogleMarketingCredentialStore,
   createGoogleMarketingRuntime,
   createServer
-} from "./chunk-T3MTYL7I.js";
+} from "./chunk-LLVE7B3V.js";
 import {
   loadConfig
 } from "./chunk-WZL73LY3.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonry/canonry",
-  "version": "5.30.0",
+  "version": "5.30.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 @@
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",
     "@ainyc/canonry-api-client": "0.0.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-web": "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-cloud-run": "0.0.0",
-    "@ainyc/canonry-integration-cloudflare-queue": "0.0.0",
     "@ainyc/canonry-integration-cloudflare-worker": "0.0.0",
+    "@ainyc/canonry-integration-google": "0.0.0",
     "@ainyc/canonry-integration-commoncrawl": "0.0.0",
     "@ainyc/canonry-integration-google-ads": "0.0.0",
-    "@ainyc/canonry-integration-google": "0.0.0",
-    "@ainyc/canonry-integration-google-business-profile": "0.0.0",
-    "@ainyc/canonry-integration-google-tag-manager": "0.0.0",
     "@ainyc/canonry-integration-google-places": "0.0.0",
+    "@ainyc/canonry-integration-google-tag-manager": "0.0.0",
     "@ainyc/canonry-integration-openai-ads": "0.0.0",
+    "@ainyc/canonry-integration-google-business-profile": "0.0.0",
+    "@ainyc/canonry-integration-cloudflare-queue": "0.0.0",
     "@ainyc/canonry-integration-traffic": "0.0.0",
-    "@ainyc/canonry-intelligence": "0.0.0",
     "@ainyc/canonry-integration-wordpress": "0.0.0",
-    "@ainyc/canonry-provider-cdp": "0.0.0",
     "@ainyc/canonry-provider-claude": "0.0.0",
-    "@ainyc/canonry-provider-gemini": "0.0.0",
+    "@ainyc/canonry-provider-cdp": "0.0.0",
+    "@ainyc/canonry-intelligence": "0.0.0",
     "@ainyc/canonry-provider-local": "0.0.0",
     "@ainyc/canonry-provider-muse": "0.0.0",
-    "@ainyc/canonry-provider-perplexity": "0.0.0",
     "@ainyc/canonry-provider-openai": "0.0.0",
+    "@ainyc/canonry-provider-gemini": "0.0.0",
+    "@ainyc/canonry-provider-perplexity": "0.0.0",
     "@ainyc/canonry-integration-typesafe": "0.0.0"
   },
   "scripts": {