@ainyc/canonry 1.32.0 → 1.34.0

package/dist/cli.js

@@ -26,7 +26,7 @@ import {
   setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-5Q6LISDM.js";
+} from "./chunk-4SRBJCNX.js";
 
 // src/cli.ts
 import { pathToFileURL } from "url";
@@ -1386,14 +1386,6 @@ async function gaConnect(project, opts) {
       details: { project }
     });
   }
-  if (!opts.keyFile && !opts.keyJson) {
-    throw new CliError({
-      code: "GA_KEY_REQUIRED",
-      message: "Service account key is required (pass --key-file or --key-json)",
-      displayMessage: "Error: --key-file or --key-json is required",
-      details: { project }
-    });
-  }
   const body = {
     propertyId: opts.propertyId
   };
@@ -1422,8 +1414,12 @@ async function gaConnect(project, opts) {
     return;
   }
   console.log(`GA4 connected for project "${project}".`);
-  console.log(`  Property ID:     ${result.propertyId}`);
-  console.log(`  Service Account: ${result.clientEmail}`);
+  console.log(`  Property ID:  ${result.propertyId}`);
+  if (result.authMethod === "service-account" && result.clientEmail) {
+    console.log(`  Auth:         service account (${result.clientEmail})`);
+  } else {
+    console.log(`  Auth:         OAuth (canonry google connect --type ga4)`);
+  }
 }
 async function gaDisconnect(project, format) {
   const client = getClient3();
@@ -1443,15 +1439,22 @@ async function gaStatus(project, format) {
   }
   if (!result.connected) {
     console.log(`No GA4 connection for project "${project}".`);
-    console.log('Run "canonry ga connect <project> --property-id <id> --key-file <path>" to connect.');
+    console.log("Options:");
+    console.log("  With service account: canonry ga connect <project> --property-id <id> --key-file <path>");
+    console.log("  With OAuth:           canonry google connect <project> --type ga4");
+    console.log("                        canonry ga connect <project> --property-id <id>");
     return;
   }
   console.log(`GA4 for "${project}":
 `);
-  console.log(`  Property ID:     ${result.propertyId}`);
-  console.log(`  Service Account: ${result.clientEmail}`);
-  console.log(`  Last Synced:     ${result.lastSyncedAt ?? "(never)"}`);
-  console.log(`  Connected:       ${result.createdAt ?? "unknown"}`);
+  console.log(`  Property ID:  ${result.propertyId}`);
+  if (result.authMethod === "service-account") {
+    console.log(`  Auth:         service account (${result.clientEmail})`);
+  } else {
+    console.log(`  Auth:         OAuth`);
+  }
+  console.log(`  Last Synced:  ${result.lastSyncedAt ?? "(never)"}`);
+  console.log(`  Connected:    ${result.createdAt ?? "unknown"}`);
 }
 async function gaSync(project, opts) {
   const client = getClient3();
@@ -1776,10 +1779,10 @@ Open this URL in your browser to authorize Google ${opts.type.toUpperCase()} acc
     console.log("(Ensure this URI is listed in your Google Cloud Console OAuth client's authorized redirect URIs)\n");
   }
   try {
-    const { exec } = await import("child_process");
+    const { spawn: spawn2 } = await import("child_process");
     const platform = process.platform;
-    const cmd = platform === "darwin" ? "open" : platform === "win32" ? "start" : "xdg-open";
-    exec(`${cmd} "${authUrl}"`);
+    const [cmd, ...extraArgs] = platform === "darwin" ? ["open", authUrl] : platform === "win32" ? ["cmd", "/c", "start", "", authUrl] : ["xdg-open", authUrl];
+    spawn2(cmd, [...extraArgs], { detached: true, stdio: "ignore" }).unref();
     console.log("(Browser opened automatically)");
   } catch {
     console.log("(Could not open browser automatically \u2014 please copy the URL above)");
@@ -4025,7 +4028,7 @@ async function showSchedule(project, format) {
 async function enableSchedule(project, format) {
   const client = getClient14();
   const current = await client.getSchedule(project);
-  const body = { timezone: current.timezone };
+  const body = { timezone: current.timezone, enabled: true };
   if (current.preset) body.preset = current.preset;
   else body.cron = current.cronExpr;
   if (current.providers.length) body.providers = current.providers;

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainyc/canonry",
-  "version": "1.32.0",
+  "version": "1.34.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-integration-google": "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-integration-wordpress": "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-local": "0.0.0",
+    "@ainyc/canonry-provider-gemini": "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-provider-cdp": "0.0.0"
   },
   "scripts": {
     "build": "tsup && tsx build-web.ts",