@ainyc/canonry 4.27.2 → 4.29.0

package/dist/cli.js

@@ -20,7 +20,7 @@ import {
   setTelemetrySource,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-ICWFH4JA.js";
+} from "./chunk-HONTKYY7.js";
 import {
   CliError,
   EXIT_SYSTEM_ERROR,
@@ -36,7 +36,7 @@ import {
   saveConfig,
   saveConfigPatch,
   usageError
-} from "./chunk-2FAEQ56I.js";
+} from "./chunk-GB3QJURO.js";
 import {
   apiKeys,
   competitors,
@@ -49,7 +49,7 @@ import {
   queries,
   querySnapshots,
   runs
-} from "./chunk-NXXD6TX7.js";
+} from "./chunk-UEV3HSRL.js";
 import {
   CcReleaseSyncStatuses,
   CheckScopes,
@@ -62,6 +62,7 @@ import {
   SkillsClients,
   TrafficEventKinds,
   determineAnswerMentioned,
+  discoveryBucketSchema,
   effectiveDomains,
   formatRunErrorOneLine,
   normalizeUrlPath,
@@ -69,7 +70,7 @@ import {
   providerQuotaPolicySchema,
   resolveProviderInput,
   skillsClientSchema
-} from "./chunk-HVW665A4.js";
+} from "./chunk-RLLFB3M3.js";
 
 // src/cli.ts
 import { pathToFileURL } from "url";
@@ -621,7 +622,7 @@ function readStoredGroundingSources(rawResponse) {
   return result;
 }
 async function backfillInsightsCommand(project, opts) {
-  const { IntelligenceService } = await import("./intelligence-service-Z6QIELKP.js");
+  const { IntelligenceService } = await import("./intelligence-service-O6KB6YAM.js");
   const config = loadConfig();
   const db = createClient(config.database);
   migrate(db);
@@ -1964,30 +1965,120 @@ var TERMINAL_DISCOVERY_STATUSES = /* @__PURE__ */ new Set([
 function getClient4() {
   return createApiClient();
 }
-async function discoverRun(project, opts) {
-  const client = getClient4();
+function buildRunBody(opts, icpDescription) {
   const body = {};
-  if (opts.icp) body.icpDescription = opts.icp;
+  if (icpDescription) body.icpDescription = icpDescription;
   if (opts.dedupThreshold !== void 0) body.dedupThreshold = opts.dedupThreshold;
   if (opts.maxProbes !== void 0) body.maxProbes = opts.maxProbes;
-  const start = await client.triggerDiscoveryRun(project, body);
+  return body;
+}
+function resolveIcpAngles(opts) {
+  const angles = (opts.icpAngles ?? []).map((a) => a.trim()).filter((a) => a.length > 0);
+  if (angles.length > 0) return { angles, multiAngle: true };
+  const icp = opts.icp?.trim();
+  if (icp) return { angles: [icp], multiAngle: false };
+  return { angles: [void 0], multiAngle: false };
+}
+function summarizeAngles(sessions) {
+  return {
+    angleCount: sessions.length,
+    totalProbes: sessions.reduce((sum, s) => sum + (s.probeCount ?? 0), 0),
+    totalCited: sessions.reduce((sum, s) => sum + (s.citedCount ?? 0), 0),
+    totalWasted: sessions.reduce((sum, s) => sum + (s.wastedCount ?? 0), 0),
+    totalAspirational: sessions.reduce((sum, s) => sum + (s.aspirationalCount ?? 0), 0)
+  };
+}
+function errorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+async function discoverRun(project, opts) {
+  const client = getClient4();
+  const { angles, multiAngle } = resolveIcpAngles(opts);
+  const runs2 = [];
+  for (const angle of angles) {
+    try {
+      const start = await client.triggerDiscoveryRun(project, buildRunBody(opts, angle));
+      runs2.push({ angle, start });
+    } catch (err) {
+      if (runs2.length > 0) {
+        process.stderr.write(
+          `
+Failed to start ${angle ? `angle "${angle}"` : "discovery run"}: ${errorMessage(err)}
+Sessions already started (recover with \`canonry discover show ${project} <id>\`):
+` + runs2.map((r) => `  ${r.start.sessionId}`).join("\n") + "\n"
+        );
+      }
+      throw err;
+    }
+  }
   if (!opts.wait) {
     if (opts.format === "json") {
-      console.log(JSON.stringify(start, null, 2));
+      console.log(JSON.stringify(multiAngle ? runs2.map((r) => r.start) : runs2[0].start, null, 2));
       return;
     }
-    console.log(`Discovery run started: ${start.runId}`);
-    console.log(`  Session: ${start.sessionId}`);
-    console.log(`  Status:  ${start.status}`);
-    console.log(`  Tail:    canonry discover show ${project} ${start.sessionId}`);
+    for (const { angle, start } of runs2) {
+      if (angle) console.log(`[${angle}]`);
+      console.log(`Discovery run started: ${start.runId}`);
+      console.log(`  Session: ${start.sessionId}`);
+      console.log(`  Status:  ${start.status}`);
+      console.log(`  Tail:    canonry discover show ${project} ${start.sessionId}`);
+      if (runs2.length > 1) console.log();
+    }
     return;
   }
-  const final = await pollSession(client, project, start.sessionId);
-  if (opts.format === "json") {
-    console.log(JSON.stringify(final, null, 2));
-    return;
+  const parallel = runs2.length > 1;
+  if (parallel) process.stderr.write(`Waiting for ${runs2.length} discovery sessions...
+`);
+  const settled = await Promise.allSettled(
+    runs2.map((r) => pollSession(client, project, r.start.sessionId, parallel))
+  );
+  const results = [];
+  const failures = [];
+  settled.forEach((outcome, i) => {
+    const run = runs2[i];
+    if (outcome.status === "fulfilled") {
+      results.push({ angle: run.angle, session: outcome.value });
+    } else {
+      failures.push({ angle: run.angle, sessionId: run.start.sessionId, reason: outcome.reason });
+    }
+  });
+  if (results.length > 0) {
+    if (opts.format === "json") {
+      console.log(JSON.stringify(multiAngle ? results.map((r) => r.session) : results[0].session, null, 2));
+    } else {
+      for (const { angle, session } of results) {
+        if (angle) console.log(`## ICP angle: ${angle}
+`);
+        printSessionDetail(session);
+        if (results.length > 1) console.log();
+      }
+      if (results.length > 1) {
+        const summary = summarizeAngles(results.map((r) => r.session));
+        console.log(`\u2500\u2500 Summary across ${summary.angleCount} angle(s) \u2500\u2500`);
+        console.log(
+          `  Probes: ${summary.totalProbes}  Cited: ${summary.totalCited}  Wasted: ${summary.totalWasted}  Aspirational: ${summary.totalAspirational}`
+        );
+        console.log("\n  Promote each session:");
+        for (const { session } of results) {
+          console.log(`    canonry discover promote ${project} ${session.id}`);
+        }
+      }
+    }
+  }
+  if (failures.length > 0) {
+    if (!multiAngle) throw failures[0].reason;
+    for (const f of failures) {
+      process.stderr.write(
+        `Discovery session ${f.sessionId}${f.angle ? ` ("${f.angle}")` : ""} did not complete: ${errorMessage(f.reason)}
+`
+      );
+    }
+    throw new CliError({
+      code: "DISCOVERY_INCOMPLETE",
+      message: `${failures.length} of ${runs2.length} discovery session(s) did not complete`,
+      details: { failed: failures.map((f) => f.sessionId) }
+    });
   }
-  printSessionDetail(final);
 }
 async function discoverSeed(project, opts) {
   await discoverRun(project, opts);
@@ -2054,7 +2145,28 @@ async function discoverPromotePreview(project, sessionId, opts) {
     for (const c of preview.suggestedCompetitors) console.log(`    - ${c.domain} (${c.hits} hits)`);
   }
   console.log(`
-  (PR 2 will add \`canonry discover promote\` to actually merge these into the project.)`);
+  Run \`canonry discover promote ${project} ${sessionId}\` to merge cited + aspirational queries.`);
+  console.log("  Add `--bucket wasted-surface` only when off-ICP competitor gaps should be tracked.");
+}
+async function discoverPromote(project, sessionId, opts) {
+  const client = getClient4();
+  const body = {};
+  if (opts.buckets && opts.buckets.length > 0) body.buckets = opts.buckets;
+  if (opts.includeCompetitors === false) body.includeCompetitors = false;
+  const result = await client.promoteDiscovery(project, sessionId, body);
+  if (opts.format === "json") {
+    console.log(JSON.stringify(result, null, 2));
+    return;
+  }
+  const { promoted, skipped } = result;
+  console.log(`Promoted discovery session ${sessionId} into "${project}":`);
+  console.log(`  Queries:     ${promoted.queries.length} added, ${skipped.queries.length} already tracked`);
+  for (const q of promoted.queries) console.log(`    + ${q}`);
+  console.log(`  Competitors: ${promoted.competitors.length} added, ${skipped.competitors.length} already tracked`);
+  for (const c of promoted.competitors) console.log(`    + ${c}`);
+  if (promoted.queries.length === 0 && promoted.competitors.length === 0) {
+    console.log(`  Nothing new \u2014 the project's basket already covers this session.`);
+  }
 }
 function printSessionDetail(session) {
   console.log(`Discovery session: ${session.id}`);
@@ -2088,8 +2200,8 @@ function printSessionDetail(session) {
 }
 var POLL_INTERVAL_MS = 3e3;
 var POLL_TIMEOUT_MS = 15 * 60 * 1e3;
-async function pollSession(client, project, sessionId) {
-  process.stderr.write(`Waiting for discovery session ${sessionId}`);
+async function pollSession(client, project, sessionId, quiet = false) {
+  if (!quiet) process.stderr.write(`Waiting for discovery session ${sessionId}`);
   const deadline = Date.now() + POLL_TIMEOUT_MS;
   for (; ; ) {
     await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
@@ -2100,9 +2212,9 @@ async function pollSession(client, project, sessionId) {
       });
     }
     const session = await client.getDiscoverySession(project, sessionId);
-    process.stderr.write(".");
+    if (!quiet) process.stderr.write(".");
     if (TERMINAL_DISCOVERY_STATUSES.has(session.status)) {
-      process.stderr.write("\n");
+      if (!quiet) process.stderr.write("\n");
       return session;
     }
   }
@@ -2122,25 +2234,54 @@ Usage: ${usage}`, {
   }
   return parsed;
 }
+function parseBucketsOption(values, usage) {
+  const raw = getStringArray(values, "bucket");
+  if (!raw || raw.length === 0) return void 0;
+  const expanded = raw.flatMap((v) => v.split(",")).map((v) => v.trim()).filter(Boolean);
+  if (expanded.length === 0) {
+    throw usageError(
+      `Error: --bucket must include at least one value (valid: cited, aspirational, wasted-surface)
+Usage: ${usage}`,
+      {
+        message: "--bucket must include at least one value",
+        details: { command: "discover.promote", usage, option: "bucket", value: raw }
+      }
+    );
+  }
+  const buckets = [];
+  for (const value of expanded) {
+    const parsed = discoveryBucketSchema.safeParse(value);
+    if (!parsed.success) {
+      throw usageError(
+        `Error: invalid --bucket value "${value}" (valid: cited, aspirational, wasted-surface)
+Usage: ${usage}`,
+        {
+          message: `invalid --bucket value "${value}"`,
+          details: { command: "discover.promote", usage, option: "bucket", value }
+        }
+      );
+    }
+    buckets.push(parsed.data);
+  }
+  return buckets;
+}
 var DISCOVER_CLI_COMMANDS = [
   {
     path: ["discover", "run"],
-    usage: 'canonry discover run <project> [--icp "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]',
+    usage: 'canonry discover run <project> [--icp "..."] [--icp-angle "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]',
     options: {
       icp: stringOption(),
+      "icp-angle": multiStringOption(),
       "dedup-threshold": stringOption(),
       "max-probes": stringOption(),
       wait: { type: "boolean", default: false }
     },
     run: async (input) => {
-      const project = requireProject(
-        input,
-        "discover.run",
-        'canonry discover run <project> [--icp "..."] [--wait] [--format json]'
-      );
-      const usage = 'canonry discover run <project> [--icp "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]';
+      const usage = 'canonry discover run <project> [--icp "..."] [--icp-angle "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]';
+      const project = requireProject(input, "discover.run", usage);
       await discoverRun(project, {
         icp: getString(input.values, "icp"),
+        icpAngles: getStringArray(input.values, "icp-angle"),
         dedupThreshold: parseFloatOption(input.values, "dedup-threshold", usage),
         maxProbes: parseIntegerOption(input, "max-probes", {
           command: "discover.run",
@@ -2154,22 +2295,20 @@ var DISCOVER_CLI_COMMANDS = [
   },
   {
     path: ["discover", "seed"],
-    usage: 'canonry discover seed <project> [--icp "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]',
+    usage: 'canonry discover seed <project> [--icp "..."] [--icp-angle "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]',
     options: {
       icp: stringOption(),
+      "icp-angle": multiStringOption(),
       "dedup-threshold": stringOption(),
       "max-probes": stringOption(),
       wait: { type: "boolean", default: false }
     },
     run: async (input) => {
-      const project = requireProject(
-        input,
-        "discover.seed",
-        'canonry discover seed <project> [--icp "..."] [--wait] [--format json]'
-      );
-      const usage = 'canonry discover seed <project> [--icp "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]';
+      const usage = 'canonry discover seed <project> [--icp "..."] [--icp-angle "..."] [--dedup-threshold 0.85] [--max-probes 100] [--wait] [--format json]';
+      const project = requireProject(input, "discover.seed", usage);
       await discoverSeed(project, {
         icp: getString(input.values, "icp"),
+        icpAngles: getStringArray(input.values, "icp-angle"),
         dedupThreshold: parseFloatOption(input.values, "dedup-threshold", usage),
         maxProbes: parseIntegerOption(input, "max-probes", {
           command: "discover.seed",
@@ -2237,6 +2376,28 @@ var DISCOVER_CLI_COMMANDS = [
       await discoverShow(project, sessionId, { format: input.format });
     }
   },
+  {
+    path: ["discover", "promote"],
+    usage: "canonry discover promote <project> <session-id> [--bucket cited,aspirational,wasted-surface] [--no-competitors] [--format json]",
+    options: {
+      bucket: multiStringOption(),
+      "no-competitors": { type: "boolean", default: false }
+    },
+    run: async (input) => {
+      const usage = "canonry discover promote <project> <session-id> [--bucket cited,aspirational,wasted-surface] [--no-competitors] [--format json]";
+      const project = requireProject(input, "discover.promote", usage);
+      const sessionId = requirePositional(input, 1, {
+        command: "discover.promote",
+        usage,
+        message: "session ID is required"
+      });
+      await discoverPromote(project, sessionId, {
+        buckets: parseBucketsOption(input.values, usage),
+        includeCompetitors: !getBoolean(input.values, "no-competitors"),
+        format: input.format
+      });
+    }
+  },
   {
     path: ["discover", "promote", "preview"],
     usage: "canonry discover promote preview <project> <session-id> [--format json]",
@@ -3204,11 +3365,11 @@ async function trafficBackfill(project, opts) {
     console.log(`Inspect rebuilt rollups: canonry traffic events ${project} --source ${opts.source} --since-minutes ${submitted.daysApplied * 24 * 60}`);
     return;
   }
-  const errorMessage = final.error?.message ?? null;
+  const errorMessage2 = final.error?.message ?? null;
   throw new CliError({
     code: "TRAFFIC_BACKFILL_FAILED",
-    message: errorMessage ?? "backfill run did not complete successfully",
-    displayMessage: `Error: backfill run ${final.id} ${final.status}${errorMessage ? ` \u2014 ${errorMessage}` : ""}`,
+    message: errorMessage2 ?? "backfill run did not complete successfully",
+    displayMessage: `Error: backfill run ${final.id} ${final.status}${errorMessage2 ? ` \u2014 ${errorMessage2}` : ""}`,
     details: { project, runId: final.id, status: final.status }
   });
 }

package/dist/index.js

@@ -1,11 +1,11 @@
 import {
   createServer
-} from "./chunk-ICWFH4JA.js";
+} from "./chunk-HONTKYY7.js";
 import {
   loadConfig
-} from "./chunk-2FAEQ56I.js";
-import "./chunk-NXXD6TX7.js";
-import "./chunk-HVW665A4.js";
+} from "./chunk-GB3QJURO.js";
+import "./chunk-UEV3HSRL.js";
+import "./chunk-RLLFB3M3.js";
 export {
   createServer,
   loadConfig

package/dist/{intelligence-service-Z6QIELKP.js → intelligence-service-O6KB6YAM.js}

@@ -1,7 +1,7 @@
 import {
   IntelligenceService
-} from "./chunk-NXXD6TX7.js";
-import "./chunk-HVW665A4.js";
+} from "./chunk-UEV3HSRL.js";
+import "./chunk-RLLFB3M3.js";
 export {
   IntelligenceService
 };

package/dist/mcp.js

@@ -2,8 +2,8 @@ import {
   CliError,
   canonryMcpTools,
   createApiClient
-} from "./chunk-2FAEQ56I.js";
-import "./chunk-HVW665A4.js";
+} from "./chunk-GB3QJURO.js";
+import "./chunk-RLLFB3M3.js";
 
 // src/mcp/cli.ts
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainyc/canonry",
-  "version": "4.27.2",
+  "version": "4.29.0",
   "type": "module",
   "description": "Agent-first open-source AEO operating platform - track how answer engines cite your domain",
   "license": "FSL-1.1-ALv2",
@@ -61,21 +61,21 @@
     "tsx": "^4.19.0",
     "@ainyc/canonry-api-routes": "0.0.0",
     "@ainyc/canonry-contracts": "0.0.0",
-    "@ainyc/canonry-config": "0.0.0",
-    "@ainyc/canonry-intelligence": "0.0.0",
-    "@ainyc/canonry-integration-commoncrawl": "0.0.0",
-    "@ainyc/canonry-integration-cloud-run": "0.0.0",
     "@ainyc/canonry-db": "0.0.0",
+    "@ainyc/canonry-intelligence": "0.0.0",
     "@ainyc/canonry-integration-bing": "0.0.0",
-    "@ainyc/canonry-integration-traffic": "0.0.0",
+    "@ainyc/canonry-config": "0.0.0",
+    "@ainyc/canonry-integration-cloud-run": "0.0.0",
+    "@ainyc/canonry-integration-commoncrawl": "0.0.0",
     "@ainyc/canonry-integration-google": "0.0.0",
-    "@ainyc/canonry-integration-wordpress": "0.0.0",
+    "@ainyc/canonry-integration-traffic": "0.0.0",
     "@ainyc/canonry-provider-cdp": "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-perplexity": "0.0.0",
-    "@ainyc/canonry-provider-openai": "0.0.0"
+    "@ainyc/canonry-provider-gemini": "0.0.0",
+    "@ainyc/canonry-integration-wordpress": "0.0.0",
+    "@ainyc/canonry-provider-openai": "0.0.0",
+    "@ainyc/canonry-provider-perplexity": "0.0.0"
   },
   "scripts": {
     "build": "tsx scripts/copy-agent-assets.ts && tsup && tsx build-web.ts",