@ainyc/canonry 4.96.0 → 4.98.0

package/dist/{chunk-ROLTZPV7.js → chunk-7COFPNMH.js}

@@ -9,7 +9,7 @@ import {
   loadConfig,
   loadConfigRaw,
   saveConfigPatch
-} from "./chunk-IFB43PRW.js";
+} from "./chunk-3TH54726.js";
 import {
   CC_CACHE_DIR,
   DUCKDB_SPEC,
@@ -111,7 +111,7 @@ import {
   siteAuditPages,
   siteAuditSnapshots,
   usageCounters
-} from "./chunk-CNTBEUVE.js";
+} from "./chunk-DJVUNURL.js";
 import {
   AGENT_MEMORY_VALUE_MAX_BYTES,
   AGENT_PROVIDER_IDS,
@@ -171,7 +171,7 @@ import {
   validationError,
   winnabilityClassLabel,
   withRetry
-} from "./chunk-CEYDMSQO.js";
+} from "./chunk-CWFTMFEU.js";
 
 // src/telemetry.ts
 import crypto from "crypto";
@@ -4377,8 +4377,8 @@ function removeOpenAiAdsConnection(config, projectName) {
 
 // src/ads-sync.ts
 var log4 = createLogger("AdsSync");
-var CAMPAIGN_INSIGHT_FIELDS = ["campaign.impressions", "campaign.clicks", "campaign.spend", "metadata.readable_time"];
-var AD_GROUP_INSIGHT_FIELDS = ["ad_group.impressions", "ad_group.clicks", "ad_group.spend", "metadata.readable_time"];
+var CAMPAIGN_INSIGHT_FIELDS = ["campaign.impressions", "campaign.clicks", "campaign.spend", "campaign.conversions", "metadata.readable_time"];
+var AD_GROUP_INSIGHT_FIELDS = ["ad_group.impressions", "ad_group.clicks", "ad_group.spend", "ad_group.conversions", "metadata.readable_time"];
 function toInsightUpserts(level, entityId, rows) {
   const upserts = [];
   for (const row of rows) {
@@ -4392,7 +4392,8 @@ function toInsightUpserts(level, entityId, rows) {
       date: row.readable_time,
       impressions: row.impressions ?? 0,
       clicks: row.clicks ?? 0,
-      spendMicros: dollarsToMicros(row.spend ?? 0)
+      spendMicros: dollarsToMicros(row.spend ?? 0),
+      conversions: Math.round(row.conversions ?? 0)
     });
   }
   return upserts;
@@ -4443,6 +4444,9 @@ async function executeAdsSync(db, runId, projectId, opts) {
         log4.error("campaign.failed", { runId, campaignId: campaign.id, error: err instanceof Error ? err.message : String(err) });
       }
     }
+    const conversionTrackingConfigured = campaigns.some(
+      (c) => (c.conversion_event_setting_ids?.length ?? 0) > 0
+    );
     const insertNow = (/* @__PURE__ */ new Date()).toISOString();
     db.transaction((tx) => {
       tx.delete(adsCampaigns).where(eq4(adsCampaigns.projectId, projectId)).run();
@@ -4505,6 +4509,7 @@ async function executeAdsSync(db, runId, projectId, opts) {
             impressions: upsert.impressions,
             clicks: upsert.clicks,
             spendMicros: upsert.spendMicros,
+            conversions: upsert.conversions,
             syncRunId: runId
           }
         }).run();
@@ -4515,6 +4520,7 @@ async function executeAdsSync(db, runId, projectId, opts) {
         currencyCode: account.currency_code,
         timezone: account.timezone,
         status: account.status,
+        conversionTrackingConfigured,
         lastSyncedAt: insertNow,
         updatedAt: insertNow
       }).where(eq4(adsConnections.projectId, projectId)).run();
@@ -6396,7 +6402,7 @@ function readStoredGroundingSources(rawResponse) {
   return result;
 }
 async function backfillInsightsCommand(project, opts) {
-  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-SJKUVFZ6.js");
+  const { IntelligenceService: IntelligenceService2 } = await import("./intelligence-service-QHBXW4KI.js");
   const config = loadConfig();
   const db = createClient(config.database);
   migrate(db);
@@ -7982,7 +7988,10 @@ import { Agent } from "@mariozechner/pi-agent-core";
 import { registerBuiltInApiProviders } from "@mariozechner/pi-ai";
 
 // src/agent/providers.ts
-import { getEnvApiKey, getModel } from "@mariozechner/pi-ai";
+import {
+  getEnvApiKey,
+  getModel
+} from "@mariozechner/pi-ai";
 var PROVIDER_MODELS = {
   [AgentProviderIds.claude]: {
     [LlmCapabilities.agent]: "claude-opus-4-7",
@@ -8008,6 +8017,14 @@ var PROVIDER_MODELS = {
     [LlmCapabilities.agent]: "glm-5.1",
     [LlmCapabilities.analyze]: "glm-5-turbo",
     [LlmCapabilities.classify]: "glm-5-turbo"
+  },
+  [AgentProviderIds.deepinfra]: {
+    // DeepInfra `org/Model` slugs. GLM-5.2 drives the agent loop; the much
+    // cheaper DeepSeek-V4-Flash fills analyze + classify. Resolved into a
+    // custom openai-completions model, not pi-ai's catalog.
+    [LlmCapabilities.agent]: "zai-org/GLM-5.2",
+    [LlmCapabilities.analyze]: "deepseek-ai/DeepSeek-V4-Flash",
+    [LlmCapabilities.classify]: "deepseek-ai/DeepSeek-V4-Flash"
   }
 };
 var AGENT_PROVIDERS = {
@@ -8034,6 +8051,62 @@ var AGENT_PROVIDERS = {
     label: "Z.ai (GLM)",
     defaultModel: PROVIDER_MODELS[AgentProviderIds.zai][LlmCapabilities.agent],
     autoDetectPriority: 3
+  },
+  [AgentProviderIds.deepinfra]: {
+    // `piAiProvider` is the canonical id here (not a pi-ai vendor) — it's the
+    // `model.provider` string the agent loop hands to `getApiKey`, which
+    // `resolveAgentId` maps straight back to the deepinfra config/env key.
+    piAiProvider: AgentProviderIds.deepinfra,
+    label: "DeepInfra (GLM / DeepSeek)",
+    defaultModel: PROVIDER_MODELS[AgentProviderIds.deepinfra][LlmCapabilities.agent],
+    autoDetectPriority: 4,
+    openaiCompatible: {
+      baseUrl: "https://api.deepinfra.com/v1/openai",
+      baseUrlEnvVar: "DEEPINFRA_BASE_URL",
+      apiKeyEnvVar: "DEEPINFRA_TOKEN",
+      // DeepInfra serves open-weight models (GLM, DeepSeek) behind an
+      // OpenAI-compatible vLLM endpoint. pi-ai's `detectCompat` has no rule
+      // for api.deepinfra.com, so it would apply the strict OpenAI profile;
+      // we set the same open-model profile pi-ai uses for deepseek.com /
+      // cerebras / z.ai. `developer` role and `reasoning_effort` are
+      // OpenAI-platform-isms these models reject, `store` is response
+      // persistence DeepInfra doesn't implement, and DeepInfra documents
+      // `max_tokens` (not `max_completion_tokens`) on its OpenAI route.
+      compat: {
+        supportsStore: false,
+        supportsDeveloperRole: false,
+        supportsReasoningEffort: false,
+        maxTokensField: "max_tokens"
+      },
+      // Best-effort metadata. Costs are USD/1M tokens (DeepInfra published
+      // rates: GLM-5.2 ~$0.95 in / $0.18 cached / $3.00 out; DeepSeek-V4-Flash
+      // ~$0.10 in / $0.20 out). contextWindow is DeepInfra's 1M (fp4) serving
+      // window for both models; it's descriptive (see OpenAiCompatibleModelMeta),
+      // so it documents the real window rather than gating compaction.
+      knownModels: {
+        "zai-org/GLM-5.2": {
+          contextWindow: 1048576,
+          maxTokens: 98304,
+          reasoning: true,
+          cost: { input: 0.95, output: 3, cacheRead: 0.18, cacheWrite: 0 }
+        },
+        "deepseek-ai/DeepSeek-V4-Flash": {
+          contextWindow: 1048576,
+          maxTokens: 32768,
+          reasoning: false,
+          cost: { input: 0.1, output: 0.2, cacheRead: 0, cacheWrite: 0 }
+        }
+      },
+      // Fallback for arbitrary `--model` slugs we don't ship as tiers. cost is
+      // 0, so an unknown slug isn't cost-tracked by pi-ai's `calculateCost`;
+      // contextWindow stays conservative since we can't know the slug's window.
+      defaultModelMeta: {
+        contextWindow: 131072,
+        maxTokens: 32768,
+        reasoning: false,
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
+      }
+    }
   }
 };
 function agentProvidersByPriority() {
@@ -8055,6 +8128,9 @@ function resolveModelForProvider(provider, modelId) {
 function resolveModelForCapability(provider, capability, modelIdOverride) {
   const entry = AGENT_PROVIDERS[provider];
   const id = modelIdOverride ?? PROVIDER_MODELS[provider][capability];
+  if (entry.openaiCompatible) {
+    return buildOpenAiCompatibleModel(entry, id);
+  }
   const model = getModel(entry.piAiProvider, id);
   if (!model) {
     throw new Error(
@@ -8063,6 +8139,27 @@ function resolveModelForCapability(provider, capability, modelIdOverride) {
   }
   return model;
 }
+function buildOpenAiCompatibleModel(entry, id) {
+  const host = entry.openaiCompatible;
+  if (!host) {
+    throw new Error(`buildOpenAiCompatibleModel called for non-custom provider '${entry.piAiProvider}'`);
+  }
+  const meta = host.knownModels[id] ?? host.defaultModelMeta;
+  const baseUrl = (host.baseUrlEnvVar ? process.env[host.baseUrlEnvVar] : void 0) || host.baseUrl;
+  return {
+    id,
+    name: id,
+    api: "openai-completions",
+    provider: entry.piAiProvider,
+    baseUrl,
+    reasoning: meta.reasoning,
+    input: ["text"],
+    cost: meta.cost,
+    contextWindow: meta.contextWindow,
+    maxTokens: meta.maxTokens,
+    ...host.compat ? { compat: host.compat } : {}
+  };
+}
 function validateAgentProviderRegistry() {
   for (const provider of listAgentProviders()) {
     for (const capability of LLM_CAPABILITIES) {
@@ -8086,10 +8183,14 @@ function resolveApiKeySource(providerOrPiAi, config) {
   const entry = AGENT_PROVIDERS[id];
   const fromConfig = config.providers?.[id]?.apiKey;
   if (fromConfig) return { key: fromConfig, source: "config" };
-  const fromEnv = getEnvApiKey(entry.piAiProvider);
+  const fromEnv = entry.openaiCompatible ? process.env[entry.openaiCompatible.apiKeyEnvVar] : getEnvApiKey(entry.piAiProvider);
   if (fromEnv) return { key: fromEnv, source: "env" };
   return void 0;
 }
+function agentProviderApiKeyEnvVar(id) {
+  const entry = AGENT_PROVIDERS[id];
+  return entry.openaiCompatible ? entry.openaiCompatible.apiKeyEnvVar : `${entry.piAiProvider.toUpperCase()}_API_KEY`;
+}
 function resolveAgentId(providerOrPiAi) {
   if (isAgentProviderId(providerOrPiAi)) return providerOrPiAi;
   for (const id of AGENT_PROVIDER_IDS) {
@@ -8313,7 +8414,7 @@ ${skillBody}`;
 }
 function missingProviderMessage() {
   const configHints = agentProvidersByPriority().join(", ");
-  const envHints = agentProvidersByPriority().map((p) => `${AGENT_PROVIDERS[p].piAiProvider.toUpperCase()}_API_KEY`).join(" / ");
+  const envHints = agentProvidersByPriority().map(agentProviderApiKeyEnvVar).join(" / ");
   return `No agent LLM provider configured. Add an API key for one of: ${configHints} in ~/.canonry/config.yaml, or export ${envHints}.`;
 }
 function detectAgentProvider(config) {
@@ -9267,7 +9368,7 @@ function pickExplainProvider(config, providerOverride) {
   for (const provider of agentProvidersByPriority()) {
     if (resolveApiKeyFor(provider, config)) return provider;
   }
-  const hints = agentProvidersByPriority().map((p) => `${AGENT_PROVIDERS[p].piAiProvider.toUpperCase()}_API_KEY`).join(" / ");
+  const hints = agentProvidersByPriority().map(agentProviderApiKeyEnvVar).join(" / ");
   throw providerError(
     `No LLM provider configured. Add an API key in ~/.canonry/config.yaml or set one of: ${hints}.`
   );
@@ -10886,6 +10987,9 @@ async function createServer(opts) {
     },
     getGoogleAuthConfig: () => getGoogleAuthConfig(opts.config),
     getPlacesConfig: () => getPlacesConfig(opts.config),
+    // Resolved fresh each call so a key added at runtime (settings API) shows
+    // up immediately in the `config.agent-providers` doctor check.
+    getAgentProviderSummary: () => buildAgentProvidersResponse(opts.config).providers,
     googleConnectionStore,
     googleStateSecret,
     publicUrl: opts.config.publicUrl,

package/dist/{chunk-CEYDMSQO.js → chunk-CWFTMFEU.js}

@@ -1434,7 +1434,8 @@ var ProviderIds = {
   perplexity: "perplexity",
   local: "local",
   cdpChatgpt: "cdp:chatgpt",
-  zai: "zai"
+  zai: "zai",
+  deepinfra: "deepinfra"
 };
 var PROVIDER_IDS = Object.values(ProviderIds);
 var SweepProviderIds = {
@@ -1450,7 +1451,8 @@ var AgentProviderIds = {
   claude: ProviderIds.claude,
   openai: ProviderIds.openai,
   gemini: ProviderIds.gemini,
-  zai: ProviderIds.zai
+  zai: ProviderIds.zai,
+  deepinfra: ProviderIds.deepinfra
 };
 var AGENT_PROVIDER_IDS = Object.values(AgentProviderIds);
 function isAgentProviderId(value) {
@@ -3027,7 +3029,7 @@ function escapeRegExp(value) {
 
 // ../contracts/src/agent.ts
 import { z as z22 } from "zod";
-var agentProviderIdSchema = z22.enum(["claude", "openai", "gemini", "zai"]);
+var agentProviderIdSchema = z22.enum(["claude", "openai", "gemini", "zai", "deepinfra"]);
 var agentProviderOptionDtoSchema = z22.object({
   /** Stable identifier — what clients pass back as `provider` on the prompt endpoint. */
   id: agentProviderIdSchema,
@@ -3850,6 +3852,23 @@ function citationStateToCited(state) {
 
 // ../contracts/src/report.ts
 import { z as z28 } from "zod";
+var REPORT_PERIOD_OPTIONS = [7, 14, 30, 90];
+var REPORT_DEFAULT_PERIOD_DAYS = 30;
+var reportPeriodSchema = z28.union([z28.literal(7), z28.literal(14), z28.literal(30), z28.literal(90)]).describe("Report window in days (7, 14, 30, or 90). Defaults to 30 when omitted.");
+function isReportPeriodDays(n) {
+  return REPORT_PERIOD_OPTIONS.includes(n);
+}
+function parseReportPeriodDays(value) {
+  if (value === void 0 || value === null || value === "") return REPORT_DEFAULT_PERIOD_DAYS;
+  const n = typeof value === "number" ? value : Number(value);
+  if (!Number.isInteger(n) || !isReportPeriodDays(n)) {
+    throw validationError(`"period" must be one of ${REPORT_PERIOD_OPTIONS.join(", ")}`);
+  }
+  return n;
+}
+function reportComparisonWindowDays(periodDays) {
+  return Math.max(1, Math.floor(periodDays / 2));
+}
 var providerLocationTreatmentSchema = z28.enum([
   "prompt",
   "request-param",
@@ -3907,7 +3926,14 @@ var reportMetaSchema = z28.object({
   /** Earliest data point referenced by the report (ISO date). */
   periodStart: z28.string().nullable(),
   /** Latest data point referenced by the report (ISO date). */
-  periodEnd: z28.string().nullable()
+  periodEnd: z28.string().nullable(),
+  /**
+   * The selected report window, in days (one of `REPORT_PERIOD_OPTIONS`).
+   * Every time-windowed section scopes to this many days; renderers read it to
+   * label the window ("Last 30 days", "(30d)"). Defaults to
+   * `REPORT_DEFAULT_PERIOD_DAYS` when no `period` is requested.
+   */
+  periodDays: z28.number().int().positive()
 });
 var reportExecutiveSummarySchema = z28.object({
   /**
@@ -4331,16 +4357,25 @@ var whatsChangedSectionSchema = z28.object({
   /** Cited query count delta vs the prior completed run. Null when no prior run. */
   citedQueryCount: reportRateDeltaSchema.nullable(),
   /**
-   * GSC clicks delta — last 14 days of `gsc.trend` vs the 14 days before
-   * that. Null when GSC isn't connected or fewer than 28 trend points exist.
+   * GSC clicks delta — the most recent `comparisonWindowDays` of `gsc.trend`
+   * vs the `comparisonWindowDays` before that. Null when GSC isn't connected
+   * or fewer than `comparisonWindowDays * 2` trend points exist.
    */
   gscClicksDelta: reportRateDeltaSchema.nullable(),
   /**
-   * AI referral sessions delta — last 14 days of `aiReferrals.trend` vs the
-   * 14 days before that. Null when AI referrals aren't tracked or fewer
-   * than 28 trend points exist.
+   * AI referral sessions delta — the most recent `comparisonWindowDays` of
+   * `aiReferrals.trend` vs the `comparisonWindowDays` before that. Null when
+   * AI referrals aren't tracked or fewer than `comparisonWindowDays * 2`
+   * trend points exist.
    */
   aiReferralsDelta: reportRateDeltaSchema.nullable(),
+  /**
+   * The period-over-period half-window in days used for `gscClicksDelta` and
+   * `aiReferralsDelta` — `floor(meta.periodDays / 2)`. Renderers label those
+   * deltas "vs prior {comparisonWindowDays} days" off this single value so the
+   * SPA and HTML stay verbatim-identical.
+   */
+  comparisonWindowDays: z28.number().int().positive(),
   /**
    * Per-provider citation rate movements (latest run vs prior run). Empty
    * when no prior run. Sorted by |deltaAbs| desc — providers with the
@@ -5105,7 +5140,11 @@ var adsConnectionStatusDtoSchema = z31.object({
   currencyCode: z31.string().nullable().optional(),
   timezone: z31.string().nullable().optional(),
   status: z31.string().nullable().optional(),
-  lastSyncedAt: z31.string().nullable().optional()
+  lastSyncedAt: z31.string().nullable().optional(),
+  /** Whether the ad account has OpenAI conversion tracking (pixel or CAPI) configured,
+   *  detected from synced campaigns carrying conversion_event_setting_ids. Optional:
+   *  only present when connected. */
+  conversionTrackingConfigured: z31.boolean().optional()
 });
 var adsDisconnectResponseSchema = z31.object({
   disconnected: z31.boolean()
@@ -5163,6 +5202,10 @@ var adsInsightRowDtoSchema = z31.object({
   impressions: z31.number().int(),
   clicks: z31.number().int(),
   spendMicros: z31.number().int(),
+  /** Conversion count for the row. 0 when conversion tracking is not configured.
+   *  Conversion VALUE (for ROAS) is a deliberate follow-up: the upstream value
+   *  field is not yet captured against a live conversion-tracking account. */
+  conversions: z31.number().int(),
   /** clicks / impressions; null when impressions is 0. */
   ctr: z31.number().nullable(),
   /** spendMicros / clicks, rounded to integer micros; null when clicks is 0. */
@@ -5177,6 +5220,7 @@ var adsTotalsDtoSchema = z31.object({
   impressions: z31.number().int(),
   clicks: z31.number().int(),
   spendMicros: z31.number().int(),
+  conversions: z31.number().int(),
   ctr: z31.number().nullable(),
   cpcMicros: z31.number().int().nullable()
 });
@@ -5554,6 +5598,10 @@ export {
   citationVisibilityResponseSchema,
   emptyCitationVisibility,
   citationStateToCited,
+  REPORT_PERIOD_OPTIONS,
+  reportPeriodSchema,
+  parseReportPeriodDays,
+  reportComparisonWindowDays,
   reportActionTone,
   reportSeverityLabel,
   reportHorizonLabel,