synabun 2.0.9 → 2.1.0

package/neural-interface/lib/assistant-catalog.js

@@ -1,3 +1,5 @@
+import { EXTERNAL_SERVER_LIMITATIONS } from './mcp-external-servers.js';
+import { toolCatalogView } from '../../mcp-server/dist/services/tool-catalog.js';
 // ═══════════════════════════════════════════
 // SynaBun — Assistant model catalog (providers · models · tier · price · vision)
 // ═══════════════════════════════════════════
@@ -605,9 +607,12 @@ export function compactRow(row) {
  * @param {(change:{providers:string[], generatedAt:string})=>void} [deps.onChange] a build listed other
  *   models than the build before it (hiding has its own event and does not count)
  * @param {number} [deps.retryMs] how soon a build is redone while Claude Code or Codex gave no verified list
+ * @param {boolean} [deps.staleWhileRevalidate] an old build (past its lifetime) is given at once and built
+ *   again in the background, one build at a time; only a first build, invalidate() and force wait for one
  */
 export function createAssistantCatalog({
   fetchJson,
+  getExternalServers = () => [],
   claudePricing = null,
   codexPrice = (model) => listPrice('codex', model),
   listAccounts = () => ({}),
@@ -617,6 +622,7 @@ export function createAssistantCatalog({
   onChange = null,
   ttlMs = 30_000,
   retryMs = 5_000,
+  staleWhileRevalidate = false,
   now = Date.now,
   log = () => {},
 } = {}) {
@@ -656,14 +662,11 @@ export function createAssistantCatalog({
   async function build({ deep = false } = {}) {
     // `deep` also drops the providers' own discovery caches (a CLI or app-server round trip).
     const fresh = deep ? '?refresh=1' : '';
-    const [claudeModels, codexModels, opencodeProviders, projects, mcpProfile] = await Promise.all([
+    const [claudeModels, codexModels, opencodeProviders, projects] = await Promise.all([
       fetchJson(`/api/claude/models${fresh}`), fetchJson(`/api/codex/models${fresh}`), fetchJson('/api/opencode/providers/full'),
-      fetchJson('/api/projects'), fetchJson('/api/mcp/profile'),
+      fetchJson('/api/projects'),
     ]);
     const filter = (() => { try { return readFilter() || {}; } catch { return {}; } })();
-    const presets = mcpProfile?.presets && typeof mcpProfile.presets === 'object'
-      ? Object.entries(mcpProfile.presets).map(([name, preset]) => ({ name, label: preset?.label || name, groups: preset?.groups || [], tools: preset?.tools || null }))
-      : [];
     let accounts = {};
     try { accounts = listAccounts() || {}; } catch (error) { log('catalog:accounts-error', error?.message || String(error)); }
     // Models the user hid (Assistant → Models, Settings → OpenCode) never reach
@@ -734,8 +737,7 @@ export function createAssistantCatalog({
       opencodeListed: listedCounts.opencode,
       opencodeHidden: hidden.opencode,
       projects: pickArray(projects, ['projects']),
-      profiles: presets,
-      mcpProfiles: { presets, default: mcpProfile?.defaultProfile || mcpProfile?.profile || 'full' },
+      tools: { ...toolCatalogView(), servers: getExternalServers(pickArray(projects, ['projects'])), externalServerLimitations: EXTERNAL_SERVER_LIMITATIONS },
       accounts,
       // Efforts are per model (row.efforts); a provider's list is the union of its rows'.
       providers: [
@@ -753,7 +755,17 @@ export function createAssistantCatalog({
    */
   async function full({ force = false, deep = false } = {}) {
     if (!force && !deep && cache && now() - cache.at < cache.ttl) return cache.value;
+    // Past its lifetime: with staleWhileRevalidate the old build is the answer while the next one is made
+    // (never a build that began before an invalidate(): `current` says it was made for the lists as they are).
+    if (staleWhileRevalidate && !force && !deep && cache?.current) {
+      if (!inflight) startBuild({ deep: false }).catch((error) => log('catalog:background-error', error?.message || String(error)));
+      return cache.value;
+    }
     if (inflight) return inflight;
+    return startBuild({ deep });
+  }
+
+  function startBuild({ deep = false } = {}) {
     const started = epoch;
     inflight = build({ deep }).then((built) => {
       const { changedProviders, ...value } = built;
@@ -762,7 +774,7 @@ export function createAssistantCatalog({
       const degraded = ['claude-code', 'codex'].some((p) => value.sources[p] !== 'live');
       degradedBuilds = degraded ? degradedBuilds + 1 : 0;
       const ttl = degraded ? Math.min(ttlMs, retryMs * 2 ** (degradedBuilds - 1)) : ttlMs;
-      cache = { at: now(), value, ttl: started === epoch ? ttl : 0 };
+      cache = { at: now(), value, ttl: started === epoch ? ttl : 0, current: started === epoch };
       if (changedProviders.length && typeof onChange === 'function') {
         try { onChange({ providers: changedProviders, generatedAt: value.generatedAt }); } catch (error) { log('catalog:onchange-error', error?.message || String(error)); }
       }
@@ -872,6 +884,8 @@ export function createAssistantCatalog({
   }
 
   function invalidate() { cache = null; epoch += 1; }
+  /** The lists may have changed (a serve restarted, a CLI updated): the next read still answers with this build and makes the next one. */
+  function markStale() { if (cache) cache = { ...cache, at: -Infinity }; }
   /** A provider's own list changed: drop the copy and build the next one now (onChange reports the difference). */
   function refresh() {
     invalidate();
@@ -879,5 +893,5 @@ export function createAssistantCatalog({
     return pending ? pending.catch(() => null).then(() => full()) : full();
   }
 
-  return { get, full, peek, find, hiddenId, manageRows, manageSnapshot, brainInfo, invalidate, refresh };
+  return { get, full, peek, find, hiddenId, manageRows, manageSnapshot, brainInfo, invalidate, markStale, refresh };
 }