@ainyc/canonry 1.25.3 → 1.26.2

package/dist/cli.js

@@ -19,7 +19,7 @@ import {
   setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-G5TMCVS4.js";
+} from "./chunk-NVCAUQ33.js";
 
 // src/cli.ts
 import { pathToFileURL } from "url";
@@ -148,14 +148,56 @@ Usage: ${spec.usage}`, {
 }
 
 // src/client.ts
+function createApiClient() {
+  const config = loadConfig();
+  const basePathResolved = !!config.basePath || "CANONRY_BASE_PATH" in process.env;
+  return new ApiClient(config.apiUrl, config.apiKey, { skipProbe: basePathResolved });
+}
 var ApiClient = class {
   baseUrl;
+  originUrl;
   apiKey;
-  constructor(baseUrl, apiKey) {
-    this.baseUrl = baseUrl.replace(/\/$/, "") + "/api/v1";
+  probePromise = null;
+  probeSkipped;
+  constructor(baseUrl, apiKey, opts) {
+    this.originUrl = baseUrl.replace(/\/$/, "");
+    this.baseUrl = this.originUrl + "/api/v1";
     this.apiKey = apiKey;
+    this.probeSkipped = opts?.skipProbe ?? false;
+  }
+  /**
+   * On first API call, probe /health to auto-discover basePath when the user
+   * hasn't configured one locally. This lets `canonry run` in a separate shell
+   * discover that the server is running at e.g. /canonry/ without requiring
+   * config.yaml edits or CANONRY_BASE_PATH in every shell.
+   */
+  probeBasePath() {
+    if (this.probeSkipped) return Promise.resolve();
+    if (!this.probePromise) {
+      this.probePromise = (async () => {
+        try {
+          const origin = new URL(this.originUrl).origin;
+          const res = await fetch(`${origin}/health`, {
+            signal: AbortSignal.timeout(2e3)
+          });
+          if (res.ok) {
+            const body = await res.json();
+            if (body.basePath && typeof body.basePath === "string") {
+              const normalized = "/" + body.basePath.replace(/^\/|\/$/g, "");
+              if (normalized !== "/") {
+                this.originUrl = origin + normalized;
+                this.baseUrl = this.originUrl + "/api/v1";
+              }
+            }
+          }
+        } catch {
+        }
+      })();
+    }
+    return this.probePromise;
   }
   async request(method, path4, body) {
+    await this.probeBasePath();
     const url = `${this.baseUrl}${path4}`;
     const serializedBody = body != null ? JSON.stringify(body) : void 0;
     const headers = {
@@ -440,8 +482,7 @@ var ApiClient = class {
 
 // src/commands/bing.ts
 function getClient() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function bingConnect(project, opts) {
   let apiKey = opts?.apiKey;
@@ -636,6 +677,46 @@ async function bingInspections(project, opts) {
     );
   }
 }
+async function bingRefresh(project, format) {
+  const client = getClient();
+  const rows = await client.bingInspections(project);
+  const uniqueUrls = [...new Set(rows.map((r) => r.url))];
+  if (uniqueUrls.length === 0) {
+    if (format === "json") {
+      console.log(JSON.stringify({ refreshed: 0, message: "No previously inspected URLs to refresh." }, null, 2));
+      return;
+    }
+    console.log('No previously inspected URLs to refresh. Run "canonry bing inspect <project> <url>" first.');
+    return;
+  }
+  if (format !== "json") {
+    process.stderr.write(`Re-inspecting ${uniqueUrls.length} URL(s) via Bing`);
+  }
+  const CONCURRENCY = 10;
+  const errors = [];
+  for (let i = 0; i < uniqueUrls.length; i += CONCURRENCY) {
+    const batch = uniqueUrls.slice(i, i + CONCURRENCY);
+    const results = await Promise.allSettled(
+      batch.map((url) => client.bingInspectUrl(project, url))
+    );
+    for (const r of results) {
+      if (r.status === "rejected") {
+        errors.push(r.reason instanceof Error ? r.reason.message : String(r.reason));
+      }
+    }
+    if (format !== "json") {
+      process.stderr.write(".");
+    }
+  }
+  if (format !== "json") {
+    process.stderr.write("\n");
+  }
+  if (errors.length > 0) {
+    process.stderr.write(`${errors.length} URL(s) failed to re-inspect.
+`);
+  }
+  await bingCoverage(project, format);
+}
 async function bingRequestIndexing(project, opts) {
   const client = getClient();
   const body = {};
@@ -900,14 +981,22 @@ var BING_CLI_COMMANDS = [
       await bingPerformance(project, input.format);
     }
   },
+  {
+    path: ["bing", "refresh"],
+    usage: "canonry bing refresh <project> [--format json]",
+    run: async (input) => {
+      const project = requireProject(input, "bing.refresh", "canonry bing refresh <project> [--format json]");
+      await bingRefresh(project, input.format);
+    }
+  },
   {
     path: ["bing"],
-    usage: "canonry bing <connect|disconnect|status|sites|set-site|coverage|inspect|inspections|request-indexing|performance> <project> [args]",
+    usage: "canonry bing <connect|disconnect|status|sites|set-site|coverage|inspect|inspections|request-indexing|performance|refresh> <project> [args]",
     run: async (input) => {
       unknownSubcommand(input.positionals[0], {
         command: "bing",
-        usage: "canonry bing <connect|disconnect|status|sites|set-site|coverage|inspect|inspections|request-indexing|performance> <project> [args]",
-        available: ["connect", "disconnect", "status", "sites", "set-site", "coverage", "inspect", "inspections", "request-indexing", "performance"]
+        usage: "canonry bing <connect|disconnect|status|sites|set-site|coverage|inspect|inspections|request-indexing|performance|refresh> <project> [args]",
+        available: ["connect", "disconnect", "status", "sites", "set-site", "coverage", "inspect", "inspections", "request-indexing", "performance", "refresh"]
       });
     }
   }
@@ -915,8 +1004,7 @@ var BING_CLI_COMMANDS = [
 
 // src/commands/cdp.ts
 function getClient2() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function cdpConnect(opts) {
   const config = loadConfig();
@@ -1107,8 +1195,7 @@ var CDP_CLI_COMMANDS = [
 
 // src/commands/ga.ts
 function getClient3() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function gaConnect(project, opts) {
   if (!opts.propertyId) {
@@ -1350,8 +1437,7 @@ var GA_CLI_COMMANDS = [
 
 // src/commands/competitor.ts
 function getClient4() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function addCompetitors(project, domains, format) {
   const client = getClient4();
@@ -1432,8 +1518,7 @@ var COMPETITOR_CLI_COMMANDS = [
 
 // src/commands/google.ts
 function getClient5() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function waitForRunStatus(client, runId, config) {
   const start = Date.now();
@@ -1946,6 +2031,29 @@ async function googleRequestIndexing(project, opts) {
     console.log("All requested URLs are now indexed.");
   }
 }
+async function googleRefresh(project, format) {
+  const client = getClient5();
+  const run = await client.gscSync(project, {});
+  if (format !== "json") {
+    process.stderr.write("Refreshing GSC coverage data");
+  }
+  const current = await waitForRunStatus(client, run.id, {
+    timeoutMs: 10 * 60 * 1e3,
+    intervalMs: 2e3,
+    progressLabel: "",
+    successStatuses: ["completed", "partial"],
+    failureStatuses: ["failed"],
+    timeoutCode: "GOOGLE_REFRESH_TIMEOUT",
+    failureCode: "GOOGLE_REFRESH_FAILED",
+    timeoutMessage: "Timed out waiting for GSC refresh to complete.",
+    failureMessage: "GSC refresh failed.",
+    details: { project }
+  });
+  if (current.status === "partial" && format !== "json") {
+    process.stderr.write("Refresh completed with some errors.\n");
+  }
+  await googleCoverage(project, format);
+}
 async function googleDeindexed(project, format) {
   const client = getClient5();
   const rows = await client.gscDeindexed(project);
@@ -2213,14 +2321,22 @@ var GOOGLE_CLI_COMMANDS = [
       });
     }
   },
+  {
+    path: ["google", "refresh"],
+    usage: "canonry google refresh <project> [--format json]",
+    run: async (input) => {
+      const project = requireProject(input, "google.refresh", "canonry google refresh <project> [--format json]");
+      await googleRefresh(project, input.format);
+    }
+  },
   {
     path: ["google"],
-    usage: "canonry google <connect|disconnect|status|properties|set-property|set-sitemap|list-sitemaps|discover-sitemaps|sync|performance|inspect|inspect-sitemap|coverage|coverage-history|inspections|deindexed|request-indexing> <project> [args]",
+    usage: "canonry google <connect|disconnect|status|properties|set-property|set-sitemap|list-sitemaps|discover-sitemaps|sync|performance|inspect|inspect-sitemap|coverage|coverage-history|inspections|deindexed|request-indexing|refresh> <project> [args]",
     run: async (input) => {
       unknownSubcommand(input.positionals[0], {
         command: "google",
-        usage: "canonry google <connect|disconnect|status|properties|set-property|set-sitemap|list-sitemaps|discover-sitemaps|sync|performance|inspect|inspect-sitemap|coverage|coverage-history|inspections|deindexed|request-indexing> <project> [args]",
-        available: ["connect", "disconnect", "status", "properties", "set-property", "set-sitemap", "list-sitemaps", "discover-sitemaps", "sync", "performance", "inspect", "inspect-sitemap", "coverage", "coverage-history", "inspections", "deindexed", "request-indexing"]
+        usage: "canonry google <connect|disconnect|status|properties|set-property|set-sitemap|list-sitemaps|discover-sitemaps|sync|performance|inspect|inspect-sitemap|coverage|coverage-history|inspections|deindexed|request-indexing|refresh> <project> [args]",
+        available: ["connect", "disconnect", "status", "properties", "set-property", "set-sitemap", "list-sitemaps", "discover-sitemaps", "sync", "performance", "inspect", "inspect-sitemap", "coverage", "coverage-history", "inspections", "deindexed", "request-indexing", "refresh"]
       });
     }
   }
@@ -2229,8 +2345,7 @@ var GOOGLE_CLI_COMMANDS = [
 // src/commands/keyword.ts
 import fs from "fs";
 function getClient6() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function addKeywords(project, keywords, format) {
   const client = getClient6();
@@ -2474,8 +2589,7 @@ var KEYWORD_CLI_COMMANDS = [
 
 // src/commands/notify.ts
 function getClient7() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function addNotification(project, opts) {
   const client = getClient7();
@@ -2551,7 +2665,7 @@ function listEvents(format) {
 function printNotification(n) {
   console.log(`  ID:      ${n.id}`);
   console.log(`  Channel: ${n.channel}`);
-  console.log(`  URL:     ${n.url}`);
+  console.log(`  URL:     ${n.urlDisplay ?? n.url}`);
   console.log(`  Events:  ${n.events.join(", ")}`);
   console.log(`  Enabled: ${n.enabled ? "yes" : "no"}`);
 }
@@ -2647,8 +2761,7 @@ async function applyConfigFile(filePath) {
   }
   const content = fs2.readFileSync(filePath, "utf-8");
   const docs = parseAllDocuments(content);
-  const clientConfig = loadConfig();
-  const client = new ApiClient(clientConfig.apiUrl, clientConfig.apiKey);
+  const client = createApiClient();
   const errors = [];
   const applied = [];
   for (let i = 0; i < docs.length; i++) {
@@ -2710,8 +2823,7 @@ async function applyConfigs(filePaths, format) {
 
 // src/commands/analytics.ts
 function getClient8() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function showAnalytics(project, options) {
   const client = getClient8();
@@ -2818,8 +2930,7 @@ Source Origin Breakdown`);
 
 // src/commands/evidence.ts
 function getClient9() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function showEvidence(project, format) {
   const client = getClient9();
@@ -2854,8 +2965,7 @@ async function showEvidence(project, format) {
 // src/commands/export-cmd.ts
 import { stringify } from "yaml";
 async function exportProject(project, opts) {
-  const config = loadConfig();
-  const client = new ApiClient(config.apiUrl, config.apiKey);
+  const client = createApiClient();
   const data = await client.getExport(project);
   if (opts.includeResults) {
     try {
@@ -2876,8 +2986,7 @@ async function exportProject(project, opts) {
 
 // src/commands/history.ts
 function getClient10() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function showHistory(project, format) {
   const client = getClient10();
@@ -2916,8 +3025,7 @@ async function showHistory(project, format) {
 
 // src/commands/status.ts
 function getClient11() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function showStatus(project, format) {
   const client = getClient11();
@@ -3029,8 +3137,7 @@ var OPERATOR_CLI_COMMANDS = [
 
 // src/commands/project.ts
 function getClient12() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function createProject(name, opts) {
   const client = getClient12();
@@ -3366,8 +3473,7 @@ var PROJECT_CLI_COMMANDS = [
 
 // src/commands/run.ts
 function getClient13() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 var TERMINAL_STATUSES = /* @__PURE__ */ new Set(["completed", "partial", "failed", "cancelled"]);
 async function triggerRun(project, opts) {
@@ -3696,8 +3802,7 @@ var RUN_CLI_COMMANDS = [
 
 // src/commands/schedule.ts
 function getClient14() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function setSchedule(project, opts) {
   const client = getClient14();
@@ -3860,8 +3965,7 @@ var SCHEDULE_CLI_COMMANDS = [
 
 // src/commands/settings.ts
 function getClient15() {
-  const config = loadConfig();
-  return new ApiClient(config.apiUrl, config.apiKey);
+  return createApiClient();
 }
 async function setProvider(name, opts) {
   const client = getClient15();
@@ -5021,6 +5125,7 @@ Usage:
   canonry google request-indexing <project> <url>  Request Google indexing for a URL
   canonry google request-indexing <project> --all-unindexed  Request indexing for all unindexed URLs
   canonry google coverage <project>  Show index coverage summary
+  canonry google refresh <project>  Force-fetch fresh GSC coverage data and display updated summary
   canonry google inspections <project>  Show URL inspection history (--url <url>)
   canonry google deindexed <project>  Show pages that lost indexing
   canonry bing connect <project>     Connect Bing Webmaster Tools (prompted for API key)
@@ -5029,6 +5134,7 @@ Usage:
   canonry bing sites <project>       List registered Bing sites
   canonry bing set-site <project> <url>  Set active Bing site
   canonry bing coverage <project>    Show Bing index coverage summary
+  canonry bing refresh <project>    Force-fetch fresh Bing coverage data and display updated summary
   canonry bing inspect <project> <url>  Inspect a URL via Bing
   canonry bing inspections <project>  Show Bing URL inspection history (--url <url>)
   canonry bing request-indexing <project> <url>  Submit URL to Bing for indexing

package/dist/index.d.ts

@@ -69,6 +69,7 @@ interface CanonryConfig {
     google?: GoogleConfigEntry;
     bing?: BingConfigEntry;
     ga4?: Ga4ConfigEntry;
+    dashboardPasswordHash?: string;
     telemetry?: boolean;
     anonymousId?: string;
 }

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainyc/canonry",
-  "version": "1.25.3",
+  "version": "1.26.2",
   "type": "module",
   "description": "The ultimate open-source AEO monitoring tool - track how answer engines cite your domain",
   "license": "FSL-1.1-ALv2",
@@ -53,17 +53,17 @@
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",
     "@ainyc/canonry-contracts": "0.0.0",
-    "@ainyc/canonry-config": "0.0.0",
     "@ainyc/canonry-api-routes": "0.0.0",
-    "@ainyc/canonry-provider-local": "0.0.0",
-    "@ainyc/canonry-provider-claude": "0.0.0",
     "@ainyc/canonry-db": "0.0.0",
+    "@ainyc/canonry-config": "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-provider-local": "0.0.0",
     "@ainyc/canonry-integration-bing": "0.0.0",
-    "@ainyc/canonry-provider-gemini": "0.0.0",
+    "@ainyc/canonry-integration-google": "0.0.0",
     "@ainyc/canonry-provider-openai": "0.0.0",
-    "@ainyc/canonry-provider-perplexity": "0.0.0",
-    "@ainyc/canonry-integration-google": "0.0.0"
+    "@ainyc/canonry-provider-perplexity": "0.0.0"
   },
   "scripts": {
     "build": "tsup && tsx build-web.ts",