@johndimm/constellations 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johndimm/constellations",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "type": "module",
   "main": "./index.tsx",
   "exports": {
@@ -52,7 +52,6 @@
   },
   "dependencies": {
     "@google/genai": "^1.33.0",
-    "@johndimm/constellations": "^1.0.2",
     "@types/d3": "^7.4.3",
     "d3": "^7.9.0",
     "dotenv": "^16.4.5",

package/services/aiService.ts

@@ -5,7 +5,7 @@
  */
 import { getLlmProvider } from "./aiUtils";
 import * as geminiSvc from "./geminiService";
-import * as altSvc from "./deepseekService"; // handles deepseek, openai, anthropic
+import * as altSvc from "./deepseekService"; // non-Gemini providers (deepseek / openai / anthropic)
 
 export * from "./aiUtils";
 export type { LockedPair } from "./geminiService";

package/services/aiUtils.ts

@@ -386,7 +386,12 @@ export function setBrowserLlmOverride(provider: LlmProviderId | null): void {
 export function getBrowserLlmModel(): string | null {
   if (typeof window === "undefined") return null;
   try {
-    return window.localStorage.getItem(BROWSER_LLM_MODEL_KEY)?.trim() || null;
+    const v = window.localStorage.getItem(BROWSER_LLM_MODEL_KEY)?.trim() || null;
+    if (v && getBrowserLlmOverride() === "anthropic" && isRetiredAnthropicModel(v)) {
+      window.localStorage.removeItem(BROWSER_LLM_MODEL_KEY);
+      return null;
+    }
+    return v;
   } catch {}
   return null;
 }
@@ -419,6 +424,31 @@ export function getServerLlmModelOverride(): string | null {
   return _serverLlmModelOverride;
 }
 
+/** Default when no model is configured (claude-3-5-haiku-20241022 was retired). */
+export const DEFAULT_ANTHROPIC_MODEL = "claude-haiku-4-5-20251001";
+
+const RETIRED_ANTHROPIC_MODELS = new Set([
+  "claude-3-5-haiku-20241022",
+  "claude-3-5-haiku-20240307",
+]);
+
+export function isRetiredAnthropicModel(model: string): boolean {
+  return RETIRED_ANTHROPIC_MODELS.has(model.trim());
+}
+
+/** Per-request override → env → default; maps retired snapshot ids to current Haiku. */
+export function resolveAnthropicModel(): string {
+  const raw =
+    getServerLlmModelOverride()?.trim() ||
+    readBundledEnv("VITE_ANTHROPIC_MODEL")?.trim() ||
+    DEFAULT_ANTHROPIC_MODEL;
+  if (isRetiredAnthropicModel(raw)) {
+    console.warn(`[anthropic] replacing retired model "${raw}" with "${DEFAULT_ANTHROPIC_MODEL}"`);
+    return DEFAULT_ANTHROPIC_MODEL;
+  }
+  return raw;
+}
+
 export function getLlmProvider(): LlmProviderId {
   if (_serverLlmOverride) return _serverLlmOverride;
   const browser = getBrowserLlmOverride();

package/services/deepseekService.ts

@@ -1,6 +1,6 @@
 "use client";
 import { GeminiResponse, PersonWorksResponse, PathResponse } from "../types";
-import { parseJsonFromModelText, withTimeout, withRetry, getEnvCacheUrl, readBundledEnv, getLlmProvider, looksLikePersonName, getServerLlmModelOverride } from "./aiUtils";
+import { parseJsonFromModelText, withTimeout, withRetry, getEnvCacheUrl, readBundledEnv, getLlmProvider, looksLikePersonName, getServerLlmModelOverride, getBrowserLlmModel, resolveAnthropicModel } from "./aiUtils";
 import type { LockedPair } from "./geminiService";
 
 export type { LockedPair };
@@ -8,6 +8,10 @@ export type { LockedPair };
 const TIMEOUT_MS = 60000;
 const CLASSIFY_TIMEOUT_MS = 15000;
 
+function llmLogTag(): string {
+  return `[${getLlmProvider()}]`;
+}
+
 function shouldProxy(): boolean {
   if (typeof window === "undefined") return false;
   if ((window as any).__PRERENDER_INJECTED) return false;
@@ -20,7 +24,7 @@ async function callAiProxy(endpoint: string, body: any) {
   const resp = await fetch(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ ...body, llmProvider: getLlmProvider() }),
+    body: JSON.stringify({ ...body, llmProvider: getLlmProvider(), llmModel: getBrowserLlmModel() ?? undefined }),
   });
   if (!resp.ok) throw new Error(`AI Proxy Error (${resp.status}): ${await resp.text()}`);
   return resp.json();
@@ -32,7 +36,7 @@ async function callAltLlm(system: string, user: string, timeoutMs = TIMEOUT_MS):
   if (provider === "anthropic") {
     const key = readBundledEnv("VITE_ANTHROPIC_API_KEY");
     if (!key) throw new Error("No VITE_ANTHROPIC_API_KEY set");
-    const model = readBundledEnv("VITE_ANTHROPIC_MODEL") || "claude-3-5-haiku-20241022";
+    const model = resolveAnthropicModel();
     const res = await fetch("https://api.anthropic.com/v1/messages", {
       method: "POST",
       headers: {
@@ -217,7 +221,7 @@ Return JSON with exactly these fields:
       reasoning: s(json.reasoning, ""),
     };
   } catch (e) {
-    console.warn("[DeepSeek] classifyStartPair failed:", String(e).slice(0, 200));
+    console.warn(`${llmLogTag()} classifyStartPair failed:`, String(e).slice(0, 200));
     return fallback;
   }
 };
@@ -270,7 +274,7 @@ Return JSON:
       reasoning: json.reasoning as string | undefined,
     };
   } catch (e) {
-    console.warn("[DeepSeek] classifyEntity failed:", String(e).slice(0, 200));
+    console.warn(`${llmLogTag()} classifyEntity failed:`, String(e).slice(0, 200));
     return fallback;
   }
 };
@@ -340,7 +344,7 @@ Return JSON:
       .map(p => ({ ...p, isAtomic: true }));
     return parsed;
   } catch (e) {
-    console.error("[DeepSeek] fetchConnections error:", e);
+    console.error(`${llmLogTag()} fetchConnections error:`, e);
     return { people: [] };
   }
 };
@@ -403,7 +407,7 @@ Return JSON:
       .map(w => ({ ...w, isAtomic: false }));
     return parsed;
   } catch (e) {
-    console.error("[DeepSeek] fetchPersonWorks error:", e);
+    console.error(`${llmLogTag()} fetchPersonWorks error:`, e);
     return { works: [] };
   }
 };
@@ -444,7 +448,7 @@ Return JSON:
     if (!json || !Array.isArray(json.path)) return { path: [], found: false };
     return { path: json.path, found: json.path.length > 0 };
   } catch (e) {
-    console.error("[DeepSeek] fetchConnectionPath error:", e);
+    console.error(`${llmLogTag()} fetchConnectionPath error:`, e);
     return { path: [], found: false };
   }
 };

package/services/geminiService.ts

@@ -173,17 +173,28 @@ export function defaultStartPairResult(reason: string, term?: string): {
   };
 }
 
-/** Messy pasted now-playing / YouTube text; short single-line queries skip the extra Gemini call. */
-function rawTermNeedsMusicEntityExtract(raw: string): boolean {
+/** Messy pasted now-playing / YouTube text; also Soundings-style "Track (Artist)" / "Track by Artist". */
+export function rawTermNeedsMusicEntityExtract(raw: string): boolean {
   const t = raw.trim();
   if (!t) return false;
   if (t.length > 220) return true;
   if (t.includes("\n")) return true;
   if (/https?:\/\/(www\.)?(youtube\.com|youtu\.be)\b/i.test(t)) return true;
   if (/\b(feat\.|ft\.|official\s+video|official\s+audio)\b/i.test(t)) return true;
+  // e.g. "Summertime (Miles Davis)" from now-playing bridge — bare title is ambiguous
+  if (/^.+\s+\([^)]{2,}\)\s*$/.test(t)) return true;
+  if (/^.+\s+by\s+.+$/i.test(t)) return true;
   return false;
 }
 
+/** Normalize a graph seed before classify-start (music disambiguation). Used on server + local non-proxy paths. */
+export async function resolveStartSearchTerm(raw: string): Promise<string> {
+  const trimmed = raw.trim();
+  if (!trimmed) return trimmed;
+  if (!rawTermNeedsMusicEntityExtract(trimmed)) return trimmed;
+  return extractMusicEntity(trimmed);
+}
+
 /**
  * Given raw pasted text (YouTube title, channel name, multi-line description),
  * ask the LLM to pick the best graph starting node — using world knowledge to
@@ -295,11 +306,13 @@ export const classifyStartPair = async (
     return await callAiProxy("/api/ai/classify-start", { term: rawTerm.trim(), wikiContext });
   }
 
-  const needsMusic = rawTermNeedsMusicEntityExtract(rawTerm);
+  const term = await resolveStartSearchTerm(rawTerm);
   if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
-    console.log("[Constellations]", "classifyStartPair local Gemini path", { needsMusicExtract: needsMusic });
+    console.log("[Constellations]", "classifyStartPair local Gemini path", {
+      term: term.slice(0, 80),
+      resolvedFrom: term !== rawTerm.trim() ? rawTerm.trim().slice(0, 80) : undefined,
+    });
   }
-  const term = needsMusic ? await extractMusicEntity(rawTerm) : rawTerm.trim();
 
   const apiKey = await getApiKey();
   // String-level safety heuristic (no Wikipedia required):

package/services/llmClient.ts

@@ -1,10 +1,10 @@
 import {
   clipForLlmLog,
-  getEnvVar,
   getLlmProvider,
   getLlmApiKey,
   getResponseText,
   isRateLimitError,
+  resolveAnthropicModel,
   withRetry,
   withTimeout,
   type LlmProviderId,
@@ -77,7 +77,7 @@ async function anthropicJson(system: string | undefined, user: string): Promise<
   const key = await getLlmApiKey();
   if (!key) throw new Error("No API key for anthropic");
 
-  const model = getEnvVar("VITE_ANTHROPIC_MODEL") || "claude-3-5-haiku-20241022";
+  const model = resolveAnthropicModel();
 
   const res = await fetch("https://api.anthropic.com/v1/messages", {
     method: "POST",

package/useFullPageConstellationsHost.ts

@@ -8,6 +8,19 @@ export type NowPlayingSnapshot = {
   artist?: string | null;
 };
 
+/** Append performer when a bare title is ambiguous (e.g. "Summertime" vs "In the Summertime"). */
+function nowPlayingSearchTerm(track?: string, artist?: string): string {
+  const t = (track ?? "").trim();
+  const a = (artist ?? "").trim();
+  if (!t) return a;
+  if (!a) return t;
+  if (t.toLowerCase().includes(a.toLowerCase())) return t;
+  // Classical / rich titles already name the composer; YouTube channel is often junk.
+  if (/[:(~]/.test(t)) return t;
+  if (/\([^)]+\)\s*$/.test(t)) return t;
+  return `${t} (${a})`;
+}
+
 /**
  * State sync for every full-page constellations host (Soundings, Trailer, etc.): URL `q` / `expand`,
  * optional handoff gating, and optional live player bridge (now-playing + external search).
@@ -72,27 +85,25 @@ export function useFullPageConstellationsHost(input: {
     const album = snap?.album?.trim();
     const track = snap?.track?.trim();
     const artist = snap?.artist?.trim();
+    const searchTerm = nowPlayingSearchTerm(track, artist);
     const mergedExpand = [
       ...extra,
       ...(album ? [album] : []),
-      ...(track ? [track] : []),
-      ...(artist ? [artist] : []),
+      ...(searchTerm ? [searchTerm] : []),
+      ...(track && searchTerm !== track ? [track] : []),
+      ...(artist && !searchTerm.toLowerCase().includes(artist.toLowerCase()) ? [artist] : []),
     ];
     if (album || track) {
-      setNowPlayingKey(`${npRev}::${album || ""}::${track || ""}`);
+      setNowPlayingKey(`${npRev}::${album || ""}::${track || ""}::${artist || ""}`);
     } else {
       setNowPlayingKey(null);
     }
     if (qParam) {
       setExternalSearch(null);
     } else {
-      // Prefer the track title over the artist/channel name. For YouTube classical music,
-      // the title contains the composer ("Vaughan Williams ~ The Lark Ascending") while
-      // the artist is just the uploader's channel name. The LLM in classifyStartPair
-      // (extractMusicEntity) will parse the title to extract the primary musical entity.
-      const searchTerm = track || snap?.artist?.trim() || "";
-      if (searchTerm) {
-        setExternalSearch({ term: searchTerm, id: `np:${searchTerm.toLowerCase()}` });
+      const term = searchTerm || artist || "";
+      if (term) {
+        setExternalSearch({ term, id: `np:${term.toLowerCase()}` });
       } else {
         setExternalSearch(null);
       }