@ainyc/canonry 1.37.0 → 1.38.0

package/dist/cli.js

@@ -26,22 +26,26 @@ import {
   setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-5MOWJJND.js";
+} from "./chunk-SAVCFB5B.js";
 
 // src/cli.ts
 import { pathToFileURL } from "url";
 
 // src/cli-error.ts
+var EXIT_USER_ERROR = 1;
+var EXIT_SYSTEM_ERROR = 2;
 var CliError = class extends Error {
   code;
   displayMessage;
   details;
+  exitCode;
   constructor(options) {
     super(options.message);
     this.name = "CliError";
     this.code = options.code;
     this.displayMessage = options.displayMessage;
     this.details = options.details;
+    this.exitCode = options.exitCode ?? EXIT_USER_ERROR;
   }
 };
 function usageError(displayMessage, options) {
@@ -398,13 +402,16 @@ var ApiClient = class {
         body: serializedBody
       });
     } catch (err) {
+      if (err instanceof CliError) throw err;
       const msg = err instanceof Error ? err.message : String(err);
       if (msg.includes("fetch failed") || msg.includes("ECONNREFUSED") || msg.includes("connect ECONNREFUSED")) {
-        throw new Error(
-          `Could not connect to canonry server at ${this.baseUrl.replace("/api/v1", "")}. Start it with "canonry serve" (or "canonry serve &" to run in background).`
-        );
+        throw new CliError({
+          code: "CONNECTION_ERROR",
+          message: `Could not connect to canonry server at ${this.baseUrl.replace("/api/v1", "")}. Start it with "canonry serve" (or "canonry serve &" to run in background).`,
+          exitCode: EXIT_SYSTEM_ERROR
+        });
       }
-      throw err;
+      throw new CliError({ code: "CONNECTION_ERROR", message: msg, exitCode: EXIT_SYSTEM_ERROR });
     }
     if (!res.ok) {
       let errorBody;
@@ -413,8 +420,11 @@ var ApiClient = class {
       } catch {
         errorBody = { error: { code: "UNKNOWN", message: res.statusText } };
       }
-      const msg = errorBody && typeof errorBody === "object" && "error" in errorBody && errorBody.error && typeof errorBody.error === "object" && "message" in errorBody.error ? String(errorBody.error.message) : `HTTP ${res.status}: ${res.statusText}`;
-      throw new Error(msg);
+      const errorObj = errorBody && typeof errorBody === "object" && "error" in errorBody && errorBody.error && typeof errorBody.error === "object" ? errorBody.error : null;
+      const msg = errorObj?.message ? String(errorObj.message) : `HTTP ${res.status}: ${res.statusText}`;
+      const code = errorObj?.code ? String(errorObj.code) : "API_ERROR";
+      const exitCode = res.status >= 500 ? EXIT_SYSTEM_ERROR : EXIT_USER_ERROR;
+      throw new CliError({ code, message: msg, exitCode });
     }
     if (res.status === 204) {
       return void 0;
@@ -751,22 +761,12 @@ function getClient() {
   return createApiClient();
 }
 async function bingConnect(project, opts) {
-  let apiKey = opts?.apiKey;
-  if (!apiKey) {
-    const readline2 = await import("readline");
-    const rl = readline2.createInterface({ input: process.stdin, output: process.stderr });
-    apiKey = await new Promise((resolve) => {
-      rl.question("Bing Webmaster Tools API key: ", (answer) => {
-        rl.close();
-        resolve(answer.trim());
-      });
-    });
-  }
+  const apiKey = opts?.apiKey;
   if (!apiKey) {
     throw new CliError({
       code: "BING_API_KEY_REQUIRED",
-      message: "API key is required (pass --api-key or enter interactively)",
-      displayMessage: "Error: API key is required (pass --api-key or enter interactively)",
+      message: "API key is required. Pass --api-key <key>.",
+      displayMessage: "Error: API key is required. Pass --api-key <key>.",
       details: {
         project
       }
@@ -1698,7 +1698,11 @@ async function addCompetitors(project, domains, format) {
     }, null, 2));
     return;
   }
-  console.log(`Added ${domains.length} competitor(s) to "${project}".`);
+  if (addedDomains.length === 0) {
+    console.log(`No new competitors added to "${project}" (all already tracked).`);
+  } else {
+    console.log(`Added ${addedDomains.length} competitor(s) to "${project}".`);
+  }
 }
 async function listCompetitors(project, format) {
   const client = getClient4();
@@ -3283,13 +3287,13 @@ async function showStatus(project, format) {
     console.log(JSON.stringify({ project: projectData, runs: runs2 }, null, 2));
     return;
   }
-  console.log(`Status: ${projectData.displayName} (${projectData.name})
+  console.log(`Status: ${projectData.displayName ?? projectData.name} (${projectData.name})
 `);
   console.log(`  Domain:   ${projectData.canonicalDomain}`);
   console.log(`  Country:  ${projectData.country}`);
   console.log(`  Language: ${projectData.language}`);
   if (runs2.length > 0) {
-    const latest = runs2[runs2.length - 1];
+    const latest = runs2[0];
     console.log(`
   Latest run:`);
     console.log(`    ID:       ${latest.id}`);
@@ -3309,25 +3313,25 @@ async function showStatus(project, format) {
 var OPERATOR_CLI_COMMANDS = [
   {
     path: ["status"],
-    usage: "canonry status <project>",
+    usage: "canonry status <project> [--format json]",
     run: async (input) => {
-      const project = requireProject(input, "status", "canonry status <project>");
+      const project = requireProject(input, "status", "canonry status <project> [--format json]");
       await showStatus(project, input.format);
     }
   },
   {
     path: ["evidence"],
-    usage: "canonry evidence <project>",
+    usage: "canonry evidence <project> [--format json]",
     run: async (input) => {
-      const project = requireProject(input, "evidence", "canonry evidence <project>");
+      const project = requireProject(input, "evidence", "canonry evidence <project> [--format json]");
       await showEvidence(project, input.format);
     }
   },
   {
     path: ["history"],
-    usage: "canonry history <project>",
+    usage: "canonry history <project> [--format json]",
     run: async (input) => {
-      const project = requireProject(input, "history", "canonry history <project>");
+      const project = requireProject(input, "history", "canonry history <project> [--format json]");
       await showHistory(project, input.format);
     }
   },
@@ -3433,7 +3437,7 @@ async function showProject(name, format) {
     console.log(JSON.stringify(project, null, 2));
     return;
   }
-  console.log(`Project: ${project.displayName}
+  console.log(`Project: ${project.displayName ?? project.name}
 `);
   console.log(`  Name:             ${project.name}`);
   console.log(`  ID:               ${project.id}`);
@@ -3449,8 +3453,8 @@ async function showProject(name, format) {
   console.log(`  Tags:             ${project.tags.length > 0 ? project.tags.join(", ") : "(none)"}`);
   const labelEntries = Object.entries(project.labels);
   console.log(`  Labels:           ${labelEntries.length > 0 ? labelEntries.map(([k, v]) => `${k}=${v}`).join(", ") : "(none)"}`);
-  console.log(`  Created:          ${project.createdAt}`);
-  console.log(`  Updated:          ${project.updatedAt}`);
+  if (project.createdAt) console.log(`  Created:          ${project.createdAt}`);
+  if (project.updatedAt) console.log(`  Updated:          ${project.updatedAt}`);
 }
 async function updateProjectSettings(name, opts) {
   const client = getClient12();
@@ -3465,7 +3469,7 @@ async function updateProjectSettings(name, opts) {
     ownedDomains = ownedDomains.filter((d) => !toRemove.has(d));
   }
   const result = await client.putProject(name, {
-    displayName: opts.displayName ?? project.displayName,
+    displayName: opts.displayName ?? project.displayName ?? project.name,
     canonicalDomain: opts.domain ?? project.canonicalDomain,
     ownedDomains,
     country: opts.country ?? project.country,
@@ -5450,6 +5454,15 @@ async function serveCommand(format = "text") {
   const db = createClient(config.database);
   migrate(db);
   const app = await createServer({ config, db });
+  const shutdown = () => {
+    app.close().then(() => {
+      process.exit(0);
+    }).catch(() => {
+      process.exit(1);
+    });
+  };
+  process.on("SIGTERM", shutdown);
+  process.on("SIGINT", shutdown);
   try {
     await app.listen({ host, port });
     const url = `http://${host === "0.0.0.0" ? "localhost" : host}:${port}`;
@@ -5754,16 +5767,6 @@ import fs6 from "fs";
 function getClient17() {
   return createApiClient();
 }
-async function promptForAppPassword() {
-  const readline2 = await import("readline");
-  const rl = readline2.createInterface({ input: process.stdin, output: process.stderr });
-  return new Promise((resolve) => {
-    rl.question("WordPress Application Password: ", (answer) => {
-      rl.close();
-      resolve(answer.trim());
-    });
-  });
-}
 function printJson(value) {
   console.log(JSON.stringify(value, null, 2));
 }
@@ -5899,12 +5902,12 @@ Staging:`);
   console.log(`  Snippet:      ${diff.staging.contentSnippet || "(empty)"}`);
 }
 async function wordpressConnect(project, opts) {
-  const appPassword = opts.appPassword ?? await promptForAppPassword();
+  const appPassword = opts.appPassword;
   if (!appPassword) {
     throw new CliError({
       code: "WORDPRESS_APP_PASSWORD_REQUIRED",
       message: "WordPress Application Password is required",
-      displayMessage: "Error: WordPress Application Password is required (pass --app-password or enter interactively).",
+      displayMessage: "Error: WordPress Application Password is required. Pass --app-password <password>.",
       details: { project }
     });
   }
@@ -6196,12 +6199,12 @@ async function wordpressSchemaStatus(project, opts) {
   }
 }
 async function wordpressOnboard(project, opts) {
-  const appPassword = opts.appPassword ?? await promptForAppPassword();
+  const appPassword = opts.appPassword;
   if (!appPassword) {
     throw new CliError({
       code: "WORDPRESS_APP_PASSWORD_REQUIRED",
       message: "WordPress Application Password is required",
-      displayMessage: "Error: WordPress Application Password is required (pass --app-password or enter interactively).",
+      displayMessage: "Error: WordPress Application Password is required. Pass --app-password <password>.",
       details: { project }
     });
   }
@@ -6853,10 +6856,10 @@ Usage:
   canonry run --all                   Trigger runs for all projects
   canonry run show <id>               Show run details and snapshots
   canonry runs <project>              List runs for a project (--limit <n>)
-  canonry status <project>            Show project summary
-  canonry evidence <project>          Show per-phrase results
+  canonry status <project>            Show project summary [--format json]
+  canonry evidence <project>          Show per-phrase results [--format json]
   canonry analytics <project>         Show analytics (--feature metrics|gaps|sources, --window 7d|30d|90d|all)
-  canonry history <project>           Show audit trail
+  canonry history <project>           Show audit trail [--format json]
   canonry export <project>            Export project as YAML
   canonry apply <file...>              Apply declarative config (multi-doc YAML supported)
   canonry schedule set <project>      Set schedule (--preset or --cron)
@@ -7015,7 +7018,7 @@ Run "canonry --help" for usage.`, {
     });
   } catch (err) {
     printCliError(err, format);
-    return 1;
+    return err instanceof CliError ? err.exitCode : EXIT_SYSTEM_ERROR;
   }
 }
 async function main(args = process.argv.slice(2)) {

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   createServer,
   loadConfig
-} from "./chunk-5MOWJJND.js";
+} from "./chunk-SAVCFB5B.js";
 export {
   createServer,
   loadConfig

package/package.json

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