@ainyc/canonry 1.26.2 → 1.27.2

package/dist/{chunk-NVCAUQ33.js → chunk-727N35MW.js}

@@ -88,13 +88,42 @@ Do not write config.yaml by hand; use "canonry init", "canonry settings", or "ca
   }
   return parsed;
 }
+function loadConfigRaw() {
+  const configPath = getConfigPath();
+  if (!fs.existsSync(configPath)) return null;
+  try {
+    return parse(fs.readFileSync(configPath, "utf-8")) ?? null;
+  } catch {
+    return null;
+  }
+}
 function saveConfig(config) {
   const configDir = getConfigDir();
   if (!fs.existsSync(configDir)) {
     fs.mkdirSync(configDir, { recursive: true });
   }
-  const yaml = stringify(config);
-  fs.writeFileSync(getConfigPath(), yaml, { encoding: "utf-8", mode: 384 });
+  const configPath = getConfigPath();
+  const onDisk = loadConfigRaw();
+  const merged = onDisk ? { ...onDisk } : {};
+  for (const [key, value] of Object.entries(config)) {
+    if (value !== void 0) {
+      merged[key] = value;
+    }
+  }
+  if (onDisk) {
+    if (process.env.CANONRY_PORT?.trim() || onDisk.basePath) {
+      merged.apiUrl = onDisk.apiUrl;
+    }
+    if ("CANONRY_BASE_PATH" in process.env) {
+      if (onDisk.basePath !== void 0) {
+        merged.basePath = onDisk.basePath;
+      } else {
+        delete merged.basePath;
+      }
+    }
+  }
+  const yaml = stringify(merged);
+  fs.writeFileSync(configPath, yaml, { encoding: "utf-8", mode: 384 });
 }
 function configExists() {
   return fs.existsSync(getConfigPath());
@@ -5051,6 +5080,14 @@ async function settingsRoutes(app, opts) {
         const err = validationError("baseUrl is required for local provider");
         return reply.status(err.statusCode).send(err.toJSON());
       }
+    } else if (name === "gemini" && !apiKey) {
+      const geminiSummary = (opts.providerSummary ?? []).find((p) => p.name === "gemini");
+      if (!geminiSummary?.vertexConfigured) {
+        const err = validationError(
+          "apiKey is required for Gemini unless Vertex AI is configured (set GEMINI_VERTEX_PROJECT env var or vertexProject in config file)"
+        );
+        return reply.status(err.statusCode).send(err.toJSON());
+      }
     } else {
       if (!apiKey || typeof apiKey !== "string") {
         const err = validationError("apiKey is required");
@@ -7631,18 +7668,58 @@ async function apiRoutes(app, opts) {
 
 // ../provider-gemini/src/normalize.ts
 import { GoogleGenerativeAI } from "@google/generative-ai";
+import { VertexAI } from "@google-cloud/vertexai";
 var DEFAULT_MODEL = "gemini-3-flash";
 var VALIDATION_PATTERN = /^gemini-/;
+function isVertexConfig(config) {
+  return !!config.vertexProject;
+}
 function resolveModel(config) {
   const m = config.model;
   if (!m) return DEFAULT_MODEL;
   if (VALIDATION_PATTERN.test(m)) return m;
+  const backend = isVertexConfig(config) ? "Vertex AI" : "AI Studio";
   console.warn(
-    `[provider-gemini] Invalid model name "${m}" \u2014 this provider uses the Gemini AI Studio API (generativelanguage.googleapis.com) which only accepts "gemini-*" model names. Falling back to ${DEFAULT_MODEL}.`
+    `[provider-gemini] Invalid model name "${m}" \u2014 this provider uses the Gemini ${backend} API which only accepts "gemini-*" model names. Falling back to ${DEFAULT_MODEL}.`
   );
   return DEFAULT_MODEL;
 }
+function wrapVertexResponse(response) {
+  return {
+    text: () => {
+      const parts = response.candidates?.[0]?.content?.parts;
+      return parts?.map((p) => p.text ?? "").join("") ?? "";
+    },
+    candidates: response.candidates?.map((c) => ({
+      content: c.content,
+      finishReason: c.finishReason,
+      groundingMetadata: c.groundingMetadata
+    })),
+    usageMetadata: response.usageMetadata
+  };
+}
+function createVertexModel(config, model, tools) {
+  const vertexOpts = {
+    project: config.vertexProject,
+    location: config.vertexRegion || "us-central1",
+    googleAuthOptions: config.vertexCredentials ? { keyFilename: config.vertexCredentials } : void 0
+  };
+  const vertexAI = new VertexAI(vertexOpts);
+  return vertexAI.getGenerativeModel({
+    model,
+    ...tools ? { tools } : {}
+  });
+}
 function validateConfig(config) {
+  if (isVertexConfig(config)) {
+    const model2 = resolveModel(config);
+    return {
+      ok: true,
+      provider: "gemini",
+      message: "config valid (Vertex AI)",
+      model: model2
+    };
+  }
   if (!config.apiKey || config.apiKey.length === 0) {
     return { ok: false, provider: "gemini", message: "missing api key" };
   }
@@ -7659,16 +7736,29 @@ async function healthcheck(config) {
   const validation = validateConfig(config);
   if (!validation.ok) return validation;
   try {
-    const genAI = new GoogleGenerativeAI(config.apiKey);
-    const model = genAI.getGenerativeModel({ model: resolveModel(config) });
-    const result = await model.generateContent('Say "ok"');
-    const text2 = result.response.text();
-    return {
-      ok: text2.length > 0,
-      provider: "gemini",
-      message: text2.length > 0 ? "gemini api key verified" : "empty response from gemini",
-      model: config.model ?? DEFAULT_MODEL
-    };
+    const model = resolveModel(config);
+    if (isVertexConfig(config)) {
+      const generativeModel = createVertexModel(config, model);
+      const result = await generativeModel.generateContent('Say "ok"');
+      const text2 = result.response.candidates?.[0]?.content?.parts?.map((p) => p.text ?? "").join("") ?? "";
+      return {
+        ok: text2.length > 0,
+        provider: "gemini",
+        message: text2.length > 0 ? "gemini vertex ai verified" : "empty response from gemini vertex ai",
+        model
+      };
+    } else {
+      const genAI = new GoogleGenerativeAI(config.apiKey);
+      const generativeModel = genAI.getGenerativeModel({ model });
+      const result = await generativeModel.generateContent('Say "ok"');
+      const text2 = result.response.text();
+      return {
+        ok: text2.length > 0,
+        provider: "gemini",
+        message: text2.length > 0 ? "gemini api key verified" : "empty response from gemini",
+        model
+      };
+    }
   } catch (err) {
     return {
       ok: false,
@@ -7680,23 +7770,41 @@ async function healthcheck(config) {
 }
 async function executeTrackedQuery(input) {
   const model = resolveModel(input.config);
-  const genAI = new GoogleGenerativeAI(input.config.apiKey);
-  const generativeModel = genAI.getGenerativeModel({
-    model,
-    tools: [{ googleSearch: {} }]
-  });
   const prompt = buildPrompt(input.keyword, input.location);
-  const result = await generativeModel.generateContent(prompt);
-  const response = result.response;
-  const groundingMetadata = extractGroundingMetadata(response);
-  const searchQueries = extractSearchQueries(response);
-  return {
-    provider: "gemini",
-    rawResponse: responseToRecord(response),
-    model,
-    groundingSources: groundingMetadata,
-    searchQueries
-  };
+  if (isVertexConfig(input.config)) {
+    const vertexSearchTool = { googleSearchRetrieval: {} };
+    const generativeModel = createVertexModel(input.config, model, [vertexSearchTool]);
+    const result = await generativeModel.generateContent(prompt);
+    const response = result.response;
+    const unified = wrapVertexResponse(response);
+    const groundingMetadata = extractGroundingMetadataFromUnified(unified);
+    const searchQueries = extractSearchQueriesFromUnified(unified);
+    return {
+      provider: "gemini",
+      rawResponse: unifiedToRecord(unified),
+      model,
+      groundingSources: groundingMetadata,
+      searchQueries
+    };
+  } else {
+    const searchTool = { googleSearch: {} };
+    const genAI = new GoogleGenerativeAI(input.config.apiKey);
+    const generativeModel = genAI.getGenerativeModel({
+      model,
+      tools: [searchTool]
+    });
+    const result = await generativeModel.generateContent(prompt);
+    const response = result.response;
+    const groundingMetadata = extractGroundingMetadata(response);
+    const searchQueries = extractSearchQueries(response);
+    return {
+      provider: "gemini",
+      rawResponse: responseToRecord(response),
+      model,
+      groundingSources: groundingMetadata,
+      searchQueries
+    };
+  }
 }
 function normalizeResult(raw) {
   const answerText = extractAnswerText(raw.rawResponse);
@@ -7742,6 +7850,22 @@ function extractGroundingMetadata(response) {
     return [];
   }
 }
+function extractGroundingMetadataFromUnified(response) {
+  try {
+    const candidate = response.candidates?.[0];
+    if (!candidate) return [];
+    const metadata = candidate.groundingMetadata;
+    if (!metadata) return [];
+    const chunks = metadata.groundingChunks;
+    if (!chunks) return [];
+    return chunks.filter((chunk) => chunk.web?.uri).map((chunk) => ({
+      uri: chunk.web.uri,
+      title: chunk.web?.title ?? ""
+    }));
+  } catch {
+    return [];
+  }
+}
 function extractSearchQueries(response) {
   try {
     const candidate = response.candidates?.[0];
@@ -7750,6 +7874,14 @@ function extractSearchQueries(response) {
     return [];
   }
 }
+function extractSearchQueriesFromUnified(response) {
+  try {
+    const candidate = response.candidates?.[0];
+    return candidate?.groundingMetadata?.webSearchQueries ?? [];
+  } catch {
+    return [];
+  }
+}
 function extractCitedDomains(raw) {
   const domains = /* @__PURE__ */ new Set();
   for (const source of raw.groundingSources) {
@@ -7797,10 +7929,16 @@ function extractDomainFromUri(uri) {
 }
 async function generateText(prompt, config) {
   const model = resolveModel(config);
-  const genAI = new GoogleGenerativeAI(config.apiKey);
-  const generativeModel = genAI.getGenerativeModel({ model });
-  const result = await generativeModel.generateContent(prompt);
-  return result.response.text();
+  if (isVertexConfig(config)) {
+    const generativeModel = createVertexModel(config, model);
+    const result = await generativeModel.generateContent(prompt);
+    return result.response.candidates?.[0]?.content?.parts?.map((p) => p.text ?? "").join("") ?? "";
+  } else {
+    const genAI = new GoogleGenerativeAI(config.apiKey);
+    const generativeModel = genAI.getGenerativeModel({ model });
+    const result = await generativeModel.generateContent(prompt);
+    return result.response.text();
+  }
 }
 function responseToRecord(response) {
   try {
@@ -7820,13 +7958,34 @@ function responseToRecord(response) {
     return { error: "failed to serialize response" };
   }
 }
+function unifiedToRecord(response) {
+  try {
+    const candidates = response.candidates?.map((c) => ({
+      content: c.content,
+      finishReason: c.finishReason,
+      groundingMetadata: c.groundingMetadata ? {
+        webSearchQueries: c.groundingMetadata.webSearchQueries,
+        groundingChunks: c.groundingMetadata.groundingChunks
+      } : void 0
+    }));
+    return {
+      candidates: candidates ?? [],
+      usageMetadata: response.usageMetadata ?? null
+    };
+  } catch {
+    return { error: "failed to serialize response" };
+  }
+}
 
 // ../provider-gemini/src/adapter.ts
 function toGeminiConfig(config) {
   return {
     apiKey: config.apiKey ?? "",
     model: config.model,
-    quotaPolicy: config.quotaPolicy
+    quotaPolicy: config.quotaPolicy,
+    vertexProject: config.vertexProject,
+    vertexRegion: config.vertexRegion,
+    vertexCredentials: config.vertexCredentials
   };
 }
 var geminiAdapter = {
@@ -10876,19 +11035,22 @@ async function createServer(opts) {
   }
   log6.info("providers.configured", { providers: Object.keys(providers).filter((k) => {
     const p = providers[k];
-    return p?.apiKey || p?.baseUrl;
+    return p?.apiKey || p?.baseUrl || p?.vertexProject;
   }) });
   for (const adapter of API_ADAPTERS) {
     const entry = providers[adapter.name];
     if (!entry) continue;
-    const isConfigured = adapter.name === "local" ? !!entry.baseUrl : !!entry.apiKey;
+    const isConfigured = adapter.name === "local" ? !!entry.baseUrl : adapter.name === "gemini" ? !!(entry.apiKey || entry.vertexProject) : !!entry.apiKey;
     if (isConfigured) {
       registry.register(adapter, {
         provider: adapter.name,
         apiKey: entry.apiKey,
         baseUrl: entry.baseUrl,
         model: entry.model,
-        quotaPolicy: entry.quota ?? DEFAULT_QUOTA
+        quotaPolicy: entry.quota ?? DEFAULT_QUOTA,
+        vertexProject: entry.vertexProject,
+        vertexRegion: entry.vertexRegion,
+        vertexCredentials: entry.vertexCredentials
       });
     }
   }
@@ -10922,7 +11084,8 @@ async function createServer(opts) {
     modelHint: `e.g. ${adapter.modelRegistry.defaultModel}`,
     model: registry.get(adapter.name)?.config.model,
     configured: !!registry.get(adapter.name),
-    quota: registry.get(adapter.name)?.config.quotaPolicy
+    quota: registry.get(adapter.name)?.config.quotaPolicy,
+    vertexConfigured: adapter.name === "gemini" ? !!opts.config.providers?.gemini?.vertexProject : void 0
   }));
   const googleSettingsSummary = {
     configured: Boolean(opts.config.google?.clientId && opts.config.google?.clientSecret)
@@ -11216,7 +11379,12 @@ async function createServer(opts) {
         apiKey: apiKey || existing?.apiKey,
         baseUrl: baseUrl || existing?.baseUrl,
         model: model || existing?.model,
-        quota: mergedQuota
+        quota: mergedQuota,
+        // Preserve Vertex AI config (Gemini provider) — these are set via
+        // config file or env vars, not through the dashboard update payload
+        vertexProject: existing?.vertexProject,
+        vertexRegion: existing?.vertexRegion,
+        vertexCredentials: existing?.vertexCredentials
       };
       try {
         saveConfig(opts.config);
@@ -11230,13 +11398,19 @@ async function createServer(opts) {
         apiKey: apiKey || existing?.apiKey,
         baseUrl: baseUrl || existing?.baseUrl,
         model: model || existing?.model,
-        quotaPolicy: quota
+        quotaPolicy: quota,
+        vertexProject: existing?.vertexProject,
+        vertexRegion: existing?.vertexRegion,
+        vertexCredentials: existing?.vertexCredentials
       });
       const entry = providerSummary.find((p) => p.name === name);
       if (entry) {
         entry.configured = true;
         entry.model = model || registry.get(name)?.config.model;
         entry.quota = quota;
+        if (name === "gemini") {
+          entry.vertexConfigured = !!opts.config.providers?.[name]?.vertexProject;
+        }
       }
       const afterConfig = summarizeProviderConfig(name, opts.config.providers[name]);
       if (JSON.stringify(beforeConfig) !== JSON.stringify(afterConfig)) {

package/dist/cli.js

@@ -19,7 +19,7 @@ import {
   setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-NVCAUQ33.js";
+} from "./chunk-727N35MW.js";
 
 // src/cli.ts
 import { pathToFileURL } from "url";
@@ -4174,6 +4174,10 @@ var envSchema = z.object({
   GEMINI_MAX_CONCURRENCY: z.coerce.number().int().positive().default(2),
   GEMINI_MAX_REQUESTS_PER_MINUTE: z.coerce.number().int().positive().default(10),
   GEMINI_MAX_REQUESTS_PER_DAY: z.coerce.number().int().positive().default(1e3),
+  // Gemini Vertex AI (alternative to API key auth)
+  GEMINI_VERTEX_PROJECT: z.string().optional(),
+  GEMINI_VERTEX_REGION: z.string().optional(),
+  GEMINI_VERTEX_CREDENTIALS: z.string().optional(),
   // OpenAI
   OPENAI_API_KEY: z.string().optional(),
   OPENAI_MODEL: z.string().optional(),
@@ -4199,6 +4203,9 @@ var bootstrapEnvSchema = z.object({
   CANONRY_DATABASE_PATH: z.string().optional(),
   GEMINI_API_KEY: z.string().optional(),
   GEMINI_MODEL: z.string().optional(),
+  GEMINI_VERTEX_PROJECT: z.string().optional(),
+  GEMINI_VERTEX_REGION: z.string().optional(),
+  GEMINI_VERTEX_CREDENTIALS: z.string().optional(),
   OPENAI_API_KEY: z.string().optional(),
   OPENAI_MODEL: z.string().optional(),
   ANTHROPIC_API_KEY: z.string().optional(),
@@ -4215,15 +4222,18 @@ function getBootstrapEnv(source, overrides) {
   const filtered = overrides ? Object.fromEntries(Object.entries(overrides).filter(([, v]) => v != null)) : {};
   const parsed = bootstrapEnvSchema.parse({ ...source, ...filtered });
   const providers = {};
-  if (parsed.GEMINI_API_KEY) {
+  if (parsed.GEMINI_API_KEY || parsed.GEMINI_VERTEX_PROJECT) {
     providers.gemini = {
-      apiKey: parsed.GEMINI_API_KEY,
+      apiKey: parsed.GEMINI_API_KEY ?? "",
       model: parsed.GEMINI_MODEL || "gemini-3-flash",
       quota: providerQuotaPolicySchema.parse({
         maxConcurrency: 2,
         maxRequestsPerMinute: 10,
         maxRequestsPerDay: 500
-      })
+      }),
+      vertexProject: parsed.GEMINI_VERTEX_PROJECT,
+      vertexRegion: parsed.GEMINI_VERTEX_REGION,
+      vertexCredentials: parsed.GEMINI_VERTEX_CREDENTIALS
     };
   }
   if (parsed.OPENAI_API_KEY) {

package/dist/index.d.ts

@@ -8,6 +8,12 @@ interface ProviderConfigEntry {
     baseUrl?: string;
     model?: string;
     quota?: ProviderQuotaPolicy;
+    /** Vertex AI GCP project ID (Gemini provider only) */
+    vertexProject?: string;
+    /** Vertex AI region, e.g. "us-central1" (Gemini provider only) */
+    vertexRegion?: string;
+    /** Path to service account JSON for Vertex AI auth (falls back to ADC) */
+    vertexCredentials?: string;
 }
 interface CdpConfigEntry {
     host?: string;

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   createServer,
   loadConfig
-} from "./chunk-NVCAUQ33.js";
+} from "./chunk-727N35MW.js";
 export {
   createServer,
   loadConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainyc/canonry",
-  "version": "1.26.2",
+  "version": "1.27.2",
   "type": "module",
   "description": "The ultimate open-source AEO monitoring tool - track how answer engines cite your domain",
   "license": "FSL-1.1-ALv2",
@@ -36,6 +36,7 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.78.0",
     "@fastify/static": "^8.1.0",
+    "@google-cloud/vertexai": "^1.10.3",
     "@google/generative-ai": "^0.24.1",
     "better-sqlite3": "^12.6.2",
     "drizzle-orm": "^0.45.1",
@@ -52,18 +53,18 @@
     "@types/node-cron": "^3.0.11",
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",
-    "@ainyc/canonry-contracts": "0.0.0",
     "@ainyc/canonry-api-routes": "0.0.0",
-    "@ainyc/canonry-db": "0.0.0",
-    "@ainyc/canonry-config": "0.0.0",
     "@ainyc/canonry-provider-claude": "0.0.0",
+    "@ainyc/canonry-contracts": "0.0.0",
     "@ainyc/canonry-provider-gemini": "0.0.0",
-    "@ainyc/canonry-provider-cdp": "0.0.0",
+    "@ainyc/canonry-config": "0.0.0",
     "@ainyc/canonry-provider-local": "0.0.0",
-    "@ainyc/canonry-integration-bing": "0.0.0",
+    "@ainyc/canonry-db": "0.0.0",
+    "@ainyc/canonry-provider-cdp": "0.0.0",
     "@ainyc/canonry-integration-google": "0.0.0",
+    "@ainyc/canonry-provider-perplexity": "0.0.0",
     "@ainyc/canonry-provider-openai": "0.0.0",
-    "@ainyc/canonry-provider-perplexity": "0.0.0"
+    "@ainyc/canonry-integration-bing": "0.0.0"
   },
   "scripts": {
     "build": "tsup && tsx build-web.ts",