fluncle 0.169.0 → 0.171.0

package/bin/fluncle.mjs

@@ -561,7 +561,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.169.0".trim() ? "0.169.0".trim() : "0.1.0";
+  currentVersion = "0.171.0".trim() ? "0.171.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2259,7 +2259,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.169.0".trim() ? "0.169.0".trim() : "0.1.0";
+  currentVersion2 = "0.171.0".trim() ? "0.171.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -6344,12 +6344,17 @@ var init_admin_artists2 = __esm(() => {
 // src/commands/admin-labels.ts
 var exports_admin_labels = {};
 __export(exports_admin_labels, {
+  mergeLabelCommand: () => mergeLabelCommand,
   labelsBioQueueCommand: () => labelsBioQueueCommand,
   draftLabelBioCommand: () => draftLabelBioCommand,
   describeLabelCommand: () => describeLabelCommand,
   backfillLabelLineageCommand: () => backfillLabelLineageCommand,
   backfillLabelImagesCommand: () => backfillLabelImagesCommand
 });
+async function mergeLabelCommand(losingSlug, canonicalSlug) {
+  const response = await adminApiPost(`/api/admin/labels/${encodeURIComponent(losingSlug)}/merge`, { canonicalSlug });
+  return response.result;
+}
 async function describeLabelCommand(slug, options) {
   return adminApiPost(`/api/admin/labels/${encodeURIComponent(slug)}/bio`, buildBioBody2(options));
 }
@@ -6384,11 +6389,14 @@ var exports_admin_covers = {};
 __export(exports_admin_covers, {
   backfillCoverMastersCommand: () => backfillCoverMastersCommand
 });
-async function backfillCoverMastersCommand(kind, limit, dryRun, cursor) {
+async function backfillCoverMastersCommand(kind, limit, dryRun, cursor, retryNone = false) {
   const params = new URLSearchParams({ dryRun: String(dryRun), kind, limit: String(limit) });
   if (cursor) {
     params.set("cursor", cursor);
   }
+  if (retryNone) {
+    params.set("retry", "none");
+  }
   return adminApiPost(`/api/admin/backfill/cover-masters?${params.toString()}`);
 }
 var init_admin_covers = __esm(() => {
@@ -9627,7 +9635,7 @@ function addAdminCommands(program2) {
     const { backfillRecordingMbidsCommand: backfillRecordingMbidsCommand2 } = await Promise.resolve().then(() => (init_admin_tracks(), exports_admin_tracks));
     await runBackfillRecordingMbids(options, backfillRecordingMbidsCommand2);
   });
-  backfill.command("cover-masters").description("Resolve owned \u22641200\xB2 cover masters (album/artist) into R2").option("--kind <kind>", "Which entity to drain: album | artist", "album").option("--dry-run", "Report the eligible worklist without any fetch or write", false).option("--limit <limit>", "Max entities to process", "50").option("--json", "Print JSON", false).action(async (options) => {
+  backfill.command("cover-masters").description("Resolve owned \u22641200\xB2 cover masters (album/artist) into R2").option("--kind <kind>", "Which entity to drain: album | artist", "album").option("--dry-run", "Report the eligible worklist without any fetch or write", false).option("--retry-none", "First re-queue a bounded batch of terminal none rows to pending, then run the pass", false).option("--limit <limit>", "Max entities to process", "50").option("--json", "Print JSON", false).action(async (options) => {
     const { backfillCoverMastersCommand: backfillCoverMastersCommand2 } = await Promise.resolve().then(() => (init_admin_covers(), exports_admin_covers));
     await runBackfillCoverMasters(options, backfillCoverMastersCommand2);
   });
@@ -9653,7 +9661,7 @@ function addAdminCommands(program2) {
     const { draftArtistBioCommand: draftArtistBioCommand2 } = await Promise.resolve().then(() => (init_admin_artists(), exports_admin_artists));
     await runEntityBioDraft("artist", slug, options, draftArtistBioCommand2);
   });
-  const labels = configureCommand(admin.command("labels").description("Label entity commands (the voiced bio)"));
+  const labels = configureCommand(admin.command("labels").description("Label entity commands (voiced bio + slug-split merge)"));
   labels.action(() => {
     labels.outputHelp();
   });
@@ -9670,6 +9678,27 @@ function addAdminCommands(program2) {
     const { draftLabelBioCommand: draftLabelBioCommand2 } = await Promise.resolve().then(() => (init_admin_labels(), exports_admin_labels));
     await runEntityBioDraft("label", slug, options, draftLabelBioCommand2);
   });
+  labels.command("merge").description("Merge a slug-split label into its canonical row (operator; re-points + redirects)").argument("<losingSlug>", "The duplicate label to fold away").argument("<canonicalSlug>", "The label to keep \u2014 everything re-points onto it").option("--json", "Print JSON", false).action(async (losingSlug, canonicalSlug, options) => {
+    const { mergeLabelCommand: mergeLabelCommand2 } = await Promise.resolve().then(() => (init_admin_labels(), exports_admin_labels));
+    const result = await mergeLabelCommand2(losingSlug, canonicalSlug);
+    if (options.json) {
+      printJson({ ok: true, result });
+      return;
+    }
+    const {
+      aliasWritten,
+      canonicalSlug: canon,
+      losingSlug: loser,
+      reconciled,
+      repointed
+    } = result;
+    console.log(`Merged ${loser} \u2192 ${canon}.`);
+    console.log(`  Re-pointed: ${repointed.tracks} track(s), ${repointed.childLabels} sublabel(s), ${repointed.aliases} alias(es).`);
+    console.log(reconciled.length > 0 ? `  Filled onto ${canon} (was empty): ${reconciled.join(", ")}.` : `  Nothing to fill \u2014 ${canon} already carried every fact.`);
+    console.log(`  Seed state resolved to: ${result.seedState}.`);
+    console.log(`  Alias written: "${aliasWritten.alias}" (${aliasWritten.aliasSlug}) \u2192 confirmed, so it can never re-mint.`);
+    console.log(`  /label/${loser} now 301s to /label/${canon}.`);
+  });
   const albums = configureCommand(admin.command("albums").description("Album entity commands (the voiced bio)"));
   albums.action(() => {
     albums.outputHelp();
@@ -10370,17 +10399,20 @@ async function runBackfillArtistImages(options, backfillArtistImagesCommand2) {
 async function runBackfillCoverMasters(options, backfillCoverMastersCommand2) {
   const limit = parseListLimit(options.limit);
   const kind = options.kind === "artist" ? "artist" : "album";
+  const retryNone = options.retryNone ?? false;
   const resolved = [];
   const none = [];
+  const requeued = [];
   const failed = [];
   let cursor;
   let dryRun = options.dryRun;
   while (resolved.length + none.length + failed.length < limit) {
     const remaining = limit - (resolved.length + none.length + failed.length);
-    const result = await backfillCoverMastersCommand2(kind, remaining, options.dryRun, cursor);
+    const result = await backfillCoverMastersCommand2(kind, remaining, options.dryRun, cursor, retryNone && cursor === undefined);
     dryRun = result.dryRun;
     resolved.push(...result.resolved);
     none.push(...result.none);
+    requeued.push(...result.requeued ?? []);
     failed.push(...result.failed);
     if (!options.json) {
       const verb2 = result.dryRun ? "would resolve" : "resolved";
@@ -10401,6 +10433,8 @@ async function runBackfillCoverMasters(options, backfillCoverMastersCommand2) {
       noneCount: none.length,
       ok: true,
       rateLimited: false,
+      requeued,
+      requeuedCount: requeued.length,
       resolved,
       resolvedCount: resolved.length
     });
@@ -10410,7 +10444,8 @@ async function runBackfillCoverMasters(options, backfillCoverMastersCommand2) {
     return;
   }
   const verb = dryRun ? "Would resolve" : "Resolved";
-  console.log(`${verb} ${resolved.length} ${kind} cover master(s); ${none.length} without a source; ${failed.length} failed.`);
+  const requeuedNote = retryNone ? ` (${dryRun ? "would re-queue" : "re-queued"} ${requeued.length} from none)` : "";
+  console.log(`${verb} ${resolved.length} ${kind} cover master(s); ${none.length} without a source; ${failed.length} failed${requeuedNote}.`);
   for (const slug of resolved) {
     console.log(`  ${slug}`);
   }

package/package.json

@@ -31,5 +31,5 @@
     "url": "git+https://github.com/mauricekleine/fluncle.git"
   },
   "type": "module",
-  "version": "0.169.0"
+  "version": "0.171.0"
 }