fluncle 0.66.0 → 0.68.0

package/bin/fluncle.mjs

@@ -423,7 +423,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.66.0".trim() ? "0.66.0".trim() : "0.1.0";
+  currentVersion = "0.68.0".trim() ? "0.68.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2138,10 +2138,13 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.66.0".trim() ? "0.66.0".trim() : "0.1.0";
+  currentVersion2 = "0.68.0".trim() ? "0.68.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
+function liveSurfaces() {
+  return SURFACES.filter((surface) => surface.pending !== true);
+}
 var SITE = "https://www.fluncle.com", PROBE_CADENCE_MS, PROBE_TIMEOUT_MS, MINUTE_MS, SURFACES;
 var init_src = __esm(() => {
   PROBE_CADENCE_MS = 10 * 60 * 1000;
@@ -2664,6 +2667,18 @@ var init_src = __esm(() => {
       operatorNotes: "Authenticated admin/agent tier. The enrichment crons drive a subset of these.",
       weights: { cli: "hidden" }
     },
+    {
+      exposedContent: [
+        "Fluncle Lens — the browser extension that finds fluncle:// coordinates on any page and links each to its /log/<coord> finding (with a hover card from the public API)"
+      ],
+      kind: "extension",
+      name: "extension.lens",
+      operatorNotes: "Fluncle Lens (apps/extension), MV3. PENDING Chrome Web Store review — DARK until approval, then flip `pending` + set the assigned listing URL. The placeholder `url` is the store search for the listing; probeConfig is the post-approval /status check.",
+      pending: true,
+      probeConfig: { cadenceMs: PROBE_CADENCE_MS, kind: "http", timeoutMs: PROBE_TIMEOUT_MS },
+      url: "https://chromewebstore.google.com/search/Fluncle%20Lens",
+      weights: { web: "secondary" }
+    },
     {
       command: "fluncle admin tracks enrich --queue",
       exposedContent: [
@@ -2820,7 +2835,7 @@ var init_status = __esm(() => {
   init_api();
   serviceLabels = (() => {
     const labels = new Map;
-    for (const surface of SURFACES) {
+    for (const surface of liveSurfaces()) {
       const match = surface.operatorNotes?.match(/service `([a-z0-9-]+)`/);
       const id = match?.[1];
       const label = surface.exposedContent[0];
@@ -3044,7 +3059,7 @@ __export(exports_admin_tracks, {
   backfillDiscogsCommand: () => backfillDiscogsCommand
 });
 async function fetchAdminTracks(options) {
-  const { hasContext, hasNote, hasObservation, hasVideo, max, order, status } = options;
+  const { hasContext, hasNote, hasObservation, hasVideo, max, order, retryEmptyContext, status } = options;
   const results = [];
   let cursor;
   do {
@@ -3055,6 +3070,9 @@ async function fetchAdminTracks(options) {
     if (hasContext !== undefined) {
       params.set("hasContext", String(hasContext));
     }
+    if (retryEmptyContext) {
+      params.set("retryEmptyContext", "true");
+    }
     if (hasNote !== undefined) {
       params.set("hasNote", String(hasNote));
     }
@@ -3094,8 +3112,8 @@ async function queueCommand(limit, filters = {}) {
 async function enrichQueueCommand(limit) {
   return fetchAdminTracks({ max: limit, order: "asc", status: "queue" });
 }
-async function contextQueueCommand(limit) {
-  return fetchAdminTracks({ hasContext: false, max: limit, order: "asc" });
+async function contextQueueCommand(limit, retryEmptyContext = false) {
+  return fetchAdminTracks({ hasContext: false, max: limit, order: "asc", retryEmptyContext });
 }
 async function observeQueueCommand(limit) {
   return fetchAdminTracks({
@@ -3144,6 +3162,73 @@ var init_admin_tracks = __esm(() => {
   init_recent2();
 });
 
+// src/version-match.ts
+function isRemix(title) {
+  return REMIX_MARKER.test(title);
+}
+function stripVersionSuffix(title) {
+  const parts = title.split(/\s+-\s+/);
+  if (parts.length > 1 && VERSION_MARKER.test(parts[parts.length - 1] ?? "")) {
+    return parts.slice(0, -1).join(" - ").trim();
+  }
+  return title.trim();
+}
+function tokenize(value) {
+  return value.toLowerCase().normalize("NFKD").replace(/[̀-ͯ]/g, "").replace(/[^a-z0-9]+/g, " ").trim().split(" ").filter(Boolean);
+}
+function versionTokens(title) {
+  const parts = title.split(/\s+-\s+/);
+  const tail = parts.length > 1 ? parts[parts.length - 1] ?? "" : "";
+  if (parts.length > 1 && VERSION_MARKER.test(tail)) {
+    return new Set(tokenize(tail));
+  }
+  const bracketed = /[([]([^)\]]*?)[)\]]/.exec(title);
+  if (bracketed?.[1] && VERSION_MARKER.test(bracketed[1])) {
+    return new Set(tokenize(bracketed[1]));
+  }
+  return new Set;
+}
+function versionMatches(findingTitle, candidateTitle) {
+  const findingIsRemix = isRemix(findingTitle);
+  const candidateIsRemix = isRemix(candidateTitle);
+  if (findingIsRemix) {
+    if (!candidateIsRemix) {
+      return false;
+    }
+    const want = [...versionTokens(findingTitle)].filter((t) => !VERSION_STOPWORDS.has(t));
+    if (want.length === 0) {
+      return true;
+    }
+    const have = versionTokens(candidateTitle);
+    for (const token of want) {
+      if (!have.has(token)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return !candidateIsRemix;
+}
+function baseTitleMatches(findingTitle, candidateTitle) {
+  const want = new Set(tokenize(stripVersionSuffix(findingTitle)));
+  const have = new Set(tokenize(stripVersionSuffix(candidateTitle)));
+  if (want.size === 0) {
+    return false;
+  }
+  for (const token of want) {
+    if (!have.has(token)) {
+      return false;
+    }
+  }
+  return true;
+}
+var VERSION_MARKER, REMIX_MARKER, VERSION_STOPWORDS;
+var init_version_match = __esm(() => {
+  VERSION_MARKER = /\b(mix|edit|version|remix|dub|vip|bootleg|rework|re-?edit|flip|refix|remaster(?:ed)?|instrumental)\b/i;
+  REMIX_MARKER = /\b(remix|bootleg|vip|rework|re-?edit|flip|refix)\b/i;
+  VERSION_STOPWORDS = new Set(["mix", "the", "and", "feat", "ft", "edit", "version", "remix"]);
+});
+
 // src/commands/preview-archive.ts
 var exports_preview_archive = {};
 __export(exports_preview_archive, {
@@ -3247,16 +3332,22 @@ async function resolveDeezerByIsrc(isrc) {
     return;
   }
 }
+function durationAgrees(findingMs, candidateSeconds) {
+  if (!findingMs || !candidateSeconds) {
+    return true;
+  }
+  return Math.abs(candidateSeconds - findingMs / 1000) <= DURATION_TOLERANCE_S;
+}
 async function resolveDeezerSearch(track) {
   const artist = track.artists[0]?.trim();
   if (!artist || !track.title.trim()) {
     return;
   }
   try {
-    const query = `artist:"${artist}" track:"${track.title.trim()}"`;
+    const query = `artist:"${artist}" track:"${stripVersionSuffix(track.title.trim())}"`;
     const response = await fetch(`https://api.deezer.com/search?q=${encodeURIComponent(query)}`);
     const body = await response.json();
-    const hit = (body.data ?? []).find((item) => item.preview);
+    const hit = (body.data ?? []).find((item) => item.preview && versionMatches(track.title, item.title ?? "") && baseTitleMatches(track.title, item.title ?? "") && durationAgrees(track.durationMs, item.duration));
     return downloadPreview(hit?.preview, "deezer:search");
   } catch {
     return;
@@ -3270,7 +3361,7 @@ async function resolveItunes(track) {
   try {
     const response = await fetch(`https://itunes.apple.com/search?term=${encodeURIComponent(`${artist} ${track.title}`)}&media=music&limit=10`);
     const body = await response.json();
-    const hit = (body.results ?? []).find((item) => item.previewUrl && normalize(item.artistName ?? "").includes(normalize(artist)));
+    const hit = (body.results ?? []).find((item) => item.previewUrl && normalize(item.artistName ?? "").includes(normalize(artist)) && versionMatches(track.title, item.trackName ?? "") && baseTitleMatches(track.title, item.trackName ?? "") && durationAgrees(track.durationMs, item.trackTimeMillis ? item.trackTimeMillis / 1000 : undefined));
     return downloadPreview(hit?.previewUrl, "itunes");
   } catch {
     return;
@@ -3332,8 +3423,10 @@ function extensionForMime(mime) {
 function normalize(value) {
   return value.toLowerCase().replace(/[^a-z0-9]/g, "");
 }
+var DURATION_TOLERANCE_S = 5;
 var init_preview_archive = __esm(() => {
   init_api();
+  init_version_match();
 });
 
 // src/commands/mixtape-youtube.ts
@@ -6471,7 +6564,7 @@ function addAdminCommands(program2) {
     const { trackObserveCommand: trackObserveCommand2 } = await Promise.resolve().then(() => (init_track(), exports_track));
     await runTrackObserve(idOrLogId, options, trackObserveCommand2);
   });
-  adminTrack.command("context").description("Gather the field notes for a finding (facts only; observe speaks from them)").argument("[idOrLogId]").option("--queue", "Show the context worklist (findings missing field notes), oldest first", false).option("--limit <limit>", "Number of findings to show with --queue", "10").option("--query <text>", "Override the fact-search query (else the Worker builds one)").option("--refresh", "Re-run the fetch even if a note exists (backfill/sharpen)", false).option("--json", "Print JSON", false).allowExcessArguments().action(async (idOrLogId, options) => {
+  adminTrack.command("context").description("Gather the field notes for a finding (facts only; observe speaks from them)").argument("[idOrLogId]").option("--queue", "Show the context worklist (findings missing field notes), oldest first", false).option("--retry-empty", "With --queue: also re-pick finds confirmed empty last pass (widen the net)", false).option("--limit <limit>", "Number of findings to show with --queue", "10").option("--query <text>", "Override the fact-search query (else the Worker builds one)").option("--refresh", "Re-run the fetch even if a note exists (backfill/sharpen)", false).option("--json", "Print JSON", false).allowExcessArguments().action(async (idOrLogId, options) => {
     if (options.queue) {
       const { contextQueueCommand: contextQueueCommand2 } = await Promise.resolve().then(() => (init_admin_tracks(), exports_admin_tracks));
       await runAdminContextQueue(options, contextQueueCommand2);
@@ -7281,7 +7374,8 @@ async function runAdminQueue(options, queueCommand2) {
 }
 async function runAdminContextQueue(options, contextQueueCommand2) {
   const limit = parseListLimit(options.limit);
-  const tracks = await contextQueueCommand2(limit);
+  const retryEmpty = options.retryEmpty === true;
+  const tracks = await contextQueueCommand2(limit, retryEmpty);
   if (options.json) {
     printJson({
       ok: true,
@@ -7295,7 +7389,8 @@ async function runAdminContextQueue(options, contextQueueCommand2) {
   }
   const { trackRows: trackRows2 } = await Promise.resolve().then(() => (init_format2(), exports_format));
   const noun = tracks.length === 1 ? "finding" : "findings";
-  console.log(`${tracks.length} ${noun} missing field notes, oldest first:`);
+  const scope = retryEmpty ? " (incl. empty retries)" : "";
+  console.log(`${tracks.length} ${noun} missing field notes${scope}, oldest first:`);
   console.log(trackRows2(tracks).join(`
 `));
 }

package/package.json

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