@nexusbloom/cli 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexusbloom/cli",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "NexusBloom CLI — run tools and workflows from your terminal",
   "type": "module",
   "bin": {

package/src/index.js

@@ -101,26 +101,29 @@ program
   .option("-s, --search <query>", "Search tools by name or description")
   .action(async (opts, cmd) => {
     const jsonMode = cmd.parent.opts().json || opts.json;
-    try {
-const url = new URL("/api/tools", API_BASE);
-      if (opts.search) url.searchParams.set("search", opts.search);
-      const res = await fetch(url);
-      const { tools } = await res.json();
-      if (!tools || tools.length === 0) {
-        if (jsonMode) return console.log(JSON.stringify({ tools: [] }));
-        console.log(chalk.yellow("No tools found."));
-        return;
-      }
-      if (jsonMode) return console.log(JSON.stringify({ tools }, null, 2));
-      console.log(chalk.bold(`\n  ${tools.length} tool${tools.length > 1 ? "s" : ""} available\n`));
-      tools.forEach((t) => {
-        console.log(`  ${chalk.cyan(t.slug.padEnd(30))} ${chalk.dim((t.description || "").slice(0, 60))}`);
-      });
-      console.log();
-    } catch (err) {
-      if (jsonMode) return console.log(JSON.stringify({ error: err.message }));
-      console.error(chalk.red("Failed to fetch tools:"), err.message);
+    const tools = await fetchToolsWithFallback();
+    if (!tools || tools.length === 0) {
+      if (jsonMode) return console.log(JSON.stringify({ tools: [] }));
+      console.log(chalk.yellow("No tools found. Set NEXUSBLOOM_SUPABASE_ANON_KEY or deploy the API."));
+      return;
     }
+    let filtered = tools;
+    if (opts.search) {
+      const q = opts.search.toLowerCase();
+      filtered = tools.filter(t =>
+        (t.slug || "").includes(q) ||
+        (t.name || "").toLowerCase().includes(q) ||
+        (t.description || "").toLowerCase().includes(q) ||
+        (t.category || "").includes(q)
+      );
+    }
+    if (jsonMode) return console.log(JSON.stringify({ tools: filtered }, null, 2));
+    console.log(chalk.bold(`\n  ${filtered.length} tool${filtered.length > 1 ? "s" : ""} available\n`));
+    filtered.forEach((t) => {
+      const typeBadge = t.type === "community" ? chalk.dim("[community]") : "";
+      console.log(`  ${chalk.cyan((t.slug || "").padEnd(30))} ${chalk.dim((t.description || "").slice(0, 50))} ${typeBadge}`);
+    });
+    console.log();
   });
 
 // ─── `nxb search <query>` — search tools ─────────────────────────────────────
@@ -130,26 +133,30 @@ program
   .argument("<query>", "Search query")
   .action(async (query, opts, cmd) => {
     const jsonMode = (cmd?.parent?.opts().json) || false;
-    try {
-const url = new URL("/api/tools", API_BASE);
-      url.searchParams.set("search", query);
-      const res = await fetch(url);
-      const { tools } = await res.json();
-      if (!tools || tools.length === 0) {
-        if (jsonMode) return console.log(JSON.stringify({ tools: [] }));
-        console.log(chalk.yellow(`No tools matching "${query}".`));
-        return;
-      }
-      if (jsonMode) return console.log(JSON.stringify({ tools, query }, null, 2));
-      console.log(chalk.bold(`\n  ${tools.length} result${tools.length > 1 ? "s" : ""} for "${query}"\n`));
-      tools.forEach((t) => {
-        console.log(`  ${chalk.cyan(t.slug.padEnd(30))} ${chalk.dim((t.description || "").slice(0, 60))}`);
-      });
-      console.log();
-    } catch (err) {
-      if (jsonMode) return console.log(JSON.stringify({ error: err.message }));
-      console.error(chalk.red("Search failed:"), err.message);
+    const tools = await fetchToolsWithFallback();
+    if (!tools || tools.length === 0) {
+      if (jsonMode) return console.log(JSON.stringify({ tools: [], query }));
+      console.log(chalk.yellow(`No tools found matching "${query}".`));
+      return;
     }
+    const q = query.toLowerCase();
+    const filtered = tools.filter(t =>
+      (t.slug || "").includes(q) ||
+      (t.name || "").toLowerCase().includes(q) ||
+      (t.description || "").toLowerCase().includes(q) ||
+      (t.category || "").includes(q)
+    );
+    if (filtered.length === 0) {
+      if (jsonMode) return console.log(JSON.stringify({ tools: [], query }));
+      console.log(chalk.yellow(`No tools matching "${query}".`));
+      return;
+    }
+    if (jsonMode) return console.log(JSON.stringify({ tools: filtered, query }, null, 2));
+    console.log(chalk.bold(`\n  ${filtered.length} result${filtered.length > 1 ? "s" : ""} for "${query}"\n`));
+    filtered.forEach((t) => {
+      console.log(`  ${chalk.cyan((t.slug || "").padEnd(30))} ${chalk.dim((t.description || "").slice(0, 60))}`);
+    });
+    console.log();
   });
 
 // ─── `nxb run <slug>` — execute a tool ───────────────────────────────────────
@@ -166,17 +173,12 @@ program
     const jsonMode = cmd.parent.opts().json;
 
     // ── Resolve abbreviation ────────────────────────────────────────────
-    try {
-      const res = await fetch(`${API_BASE}/api/tools`);
-      const { tools } = await res.json();
-      const slugs = (tools || []).map((t) => t.slug);
-      const abbrMap = generateAbbreviations(slugs);
-      if (abbrMap[slug] && slugs.includes(abbrMap[slug])) {
-        if (!jsonMode) console.log(chalk.dim(`  Resolved: ${slug} → ${abbrMap[slug]}`));
-        slug = abbrMap[slug];
-      }
-    } catch {
-      // Silently ignore abbreviation resolution failures
+    const allTools = await fetchToolsWithFallback();
+    const slugs = (allTools || []).map((t) => t.slug);
+    const abbrMap = generateAbbreviations(slugs);
+    if (abbrMap[slug] && slugs.includes(abbrMap[slug])) {
+      if (!jsonMode) console.log(chalk.dim(`  Resolved: ${slug} → ${abbrMap[slug]}`));
+      slug = abbrMap[slug];
     }
 
     // ── Build input body ────────────────────────────────────────────────
@@ -238,9 +240,8 @@ program
     // ── Remote API execution ────────────────────────────────────────────
     const apiKey = opts.key || process.env.NEXUSBLOOM_API_KEY || configGet("apiKey") || configGet("key");
     if (!apiKey) {
-      if (jsonMode) return console.log(JSON.stringify({ error: "API key required. Set NEXUSBLOOM_API_KEY, pass --key, or run `nxb config set key <your-key>`." }));
-      console.error(chalk.red("API key required. Set NEXUSBLOOM_API_KEY, pass --key, or run `nxb config set key <your-key>`."));
-      process.exit(1);
+      // No API key — try local mode automatically
+      return await executeLocal(slug, body, jsonMode);
     }
 
     try {
@@ -254,11 +255,9 @@ program
       });
 
       if (!res.ok && !res.headers.get("content-type")?.includes("json")) {
-        const text = await res.text();
-        if (jsonMode) return console.log(JSON.stringify({ error: `API returned ${res.status}: ${text.slice(0, 200)}` }));
-        console.error(chalk.red(`API returned ${res.status} (non-JSON response). The endpoint may not be deployed.`));
-        console.error(chalk.dim(`  Raw response: ${text.slice(0, 200)}`));
-        process.exit(1);
+        // API returned non-JSON (likely not deployed) — fall back to local
+        if (!jsonMode) console.log(chalk.dim(`  API not deployed, falling back to local execution...`));
+        return await executeLocal(slug, body, jsonMode);
       }
 
       const data = await res.json();
@@ -276,9 +275,9 @@ program
         process.exit(1);
       }
     } catch (err) {
-      if (jsonMode) return console.log(JSON.stringify({ error: err.message }));
-      console.error(chalk.red("Execution failed:"), err.message);
-      process.exit(1);
+      // Network error — fall back to local
+      if (!jsonMode) console.log(chalk.dim(`  API unreachable, falling back to local execution...`));
+      return await executeLocal(slug, body, jsonMode);
     }
   });
 
@@ -323,39 +322,14 @@ async function executeLocal(slug, input, jsonMode) {
       // API failed, try Supabase fallback
     }
 
-    // Fallback: query Supabase directly for v2_source
+    // Fallback: query Supabase directly via shared helper
     if (!apiSuccess) {
       try {
-        const supabaseUrl = process.env.NEXUSBLOOM_SUPABASE_URL || "https://dhxaqatmuprehrkszxzs.supabase.co";
-        const supabaseKey = process.env.NEXUSBLOOM_SUPABASE_ANON_KEY;
-        if (supabaseKey) {
-          // Get tool from tools table
-          const toolRes = await fetch(`${supabaseUrl}/rest/v1/tools?slug=eq.${slug}&select=id`, {
-            headers: { apikey: supabaseKey, Authorization: `Bearer ${supabaseKey}` }
-          });
-          const tools = await toolRes.json();
-          const toolId = tools?.[0]?.id;
-          if (toolId) {
-            // Get v2_source from tool_versions
-            const versionRes = await fetch(
-              `${supabaseUrl}/rest/v1/tool_versions?tool_id=eq.${toolId}&tool_type=eq.builtin&status=eq.published&select=v2_source&order=created_at.desc&limit=1`,
-              { headers: { apikey: supabaseKey, Authorization: `Bearer ${supabaseKey}` } }
-            );
-            const versions = await versionRes.json();
-            const v2Source = versions?.[0]?.v2_source;
-            if (v2Source) {
-              coreLogicSource = v2Source;
-              const manifestMatch = v2Source.match(/export\s+const\s+MANIFEST\s*=\s*({[\s\S]*?});\s*\n/);
-              if (manifestMatch) {
-                try {
-                  manifest = JSON.parse(manifestMatch[1].replace(/(\w+):/g, '"$1":').replace(/'/g, '"'));
-                } catch {
-                  manifest = eval("(" + manifestMatch[1] + ")");
-                }
-              }
-              apiSuccess = true;
-            }
-          }
+        const toolInfo = await fetchToolFromSupabase(slug);
+        if (toolInfo) {
+          manifest = toolInfo.manifest;
+          coreLogicSource = toolInfo.coreLogicSource;
+          apiSuccess = true;
         }
       } catch {
         // Supabase fallback also failed
@@ -363,8 +337,8 @@ async function executeLocal(slug, input, jsonMode) {
     }
 
     if (!apiSuccess) {
-      if (jsonMode) return console.log(JSON.stringify({ error: `Tool "${slug}" not found. Ensure API is deployed or set NEXUSBLOOM_SUPABASE_ANON_KEY for local mode.` }));
-      console.error(chalk.red(`Tool "${slug}" not found. Ensure API is deployed or set NEXUSBLOOM_SUPABASE_ANON_KEY for local mode.`));
+      if (jsonMode) return console.log(JSON.stringify({ error: `Tool "${slug}" not found. Set NEXUSBLOOM_SUPABASE_ANON_KEY or run \`nxb config set supabaseKey <your-anon-key>\` for offline mode.` }));
+      console.error(chalk.red(`Tool "${slug}" not found. Set NEXUSBLOOM_SUPABASE_ANON_KEY or run \`nxb config set supabaseKey <your-anon-key>\` for offline mode.`));
       process.exit(1);
     }
 
@@ -376,22 +350,21 @@ async function executeLocal(slug, input, jsonMode) {
 
   if (!coreLogicSource) {
     // Fallback: try to extract coreLogic from the manifest itself
-    if (jsonMode) return console.log(JSON.stringify({ error: "No v2 source available for local execution. Try without --local to use remote API." }));
-    console.error(chalk.yellow("No v2 source available for local execution. Try without --local to use remote API."));
+    if (jsonMode) return console.log(JSON.stringify({ error: "No v2 source available for local execution. Set NEXUSBLOOM_SUPABASE_ANON_KEY or run `nxb config set supabaseKey <your-key>`." }));
+    console.error(chalk.yellow("No v2 source available for local execution. Set NEXUSBLOOM_SUPABASE_ANON_KEY or run `nxb config set supabaseKey <your-key>`."));
     process.exit(1);
   }
 
   // Execute coreLogic locally
   try {
-    // Extract the coreLogic function from the source
-    const fnMatch = coreLogicSource.match(/export\s+(async\s+)?function\s+coreLogic[\s\S]*/);
-    if (!fnMatch) {
-      if (jsonMode) return console.log(JSON.stringify({ error: "Could not extract coreLogic from source" }));
-      console.error(chalk.red("Could not extract coreLogic from source"));
-      process.exit(1);
-    }
-    const fnSource = fnMatch[0].replace(/export\s+/, "");
-    const isAsync = fnMatch[0].startsWith("export async");
+    // Strip imports and exports, then wrap the full module scope in an IIFE
+    // that returns coreLogic — this preserves module-scoped helpers (e.g. generateField)
+    const cleanSource = coreLogicSource
+      .replace(/^import\s+.*?;?\s*$/gm, "")   // Remove import statements
+      .replace(/^export\s+/gm, "");            // Remove export keywords
+    const wrappedSource = `(function() {\n${cleanSource}\nreturn coreLogic;\n})()`;
+    const coreLogicFn = new Function("return " + wrappedSource)();
+    const isAsync = /export\s+async\s+function\s+coreLogic/.test(coreLogicSource);
 
     // Validate input against manifest
     const schema = manifest.input_schema || {};
@@ -413,17 +386,16 @@ async function executeLocal(slug, input, jsonMode) {
     }
 
     // Create and execute the function
-    const coreLogic = new Function("return " + fnSource)();
     const timeoutMs = manifest.timeout_ms || 5000;
     let result;
 
     if (isAsync) {
       result = await Promise.race([
-        coreLogic(input),
+        coreLogicFn(input),
         new Promise((_, reject) => setTimeout(() => reject(new Error(`Timed out after ${timeoutMs}ms`)), timeoutMs)),
       ]);
     } else {
-      result = coreLogic(input);
+      result = coreLogicFn(input);
     }
 
     if (jsonMode) return console.log(JSON.stringify({ success: true, data: result }, null, 2));
@@ -445,53 +417,62 @@ program
     const jsonMode = (cmd?.parent?.opts().json) || false;
 
     // Resolve abbreviation
-    try {
-      const res = await fetch(`${API_BASE}/api/tools`);
-      const { tools } = await res.json();
-      const slugs = (tools || []).map((t) => t.slug);
-      const abbrMap = generateAbbreviations(slugs);
-      if (abbrMap[slug] && slugs.includes(abbrMap[slug])) {
-        if (!jsonMode) console.log(chalk.dim(`  Resolved: ${slug} → ${abbrMap[slug]}`));
-        slug = abbrMap[slug];
-      }
-    } catch { /* ignore */ }
+    const allTools = await fetchToolsWithFallback();
+    const slugs = (allTools || []).map((t) => t.slug);
+    const abbrMap = generateAbbreviations(slugs);
+    if (abbrMap[slug] && slugs.includes(abbrMap[slug])) {
+      if (!jsonMode) console.log(chalk.dim(`  Resolved: ${slug} → ${abbrMap[slug]}`));
+      slug = abbrMap[slug];
+    }
+
+    // Try to get manifest — API first, then Supabase fallback
+    let manifest = null;
     try {
       const res = await fetch(`${API_BASE}/api/run/${slug}`);
-      if (!res.ok) {
-        if (jsonMode) return console.log(JSON.stringify({ error: `Tool "${slug}" not found` }));
-        console.error(chalk.red(`Tool "${slug}" not found.`));
-        return;
+      if (res.ok) {
+        const data = await res.json();
+        manifest = data.data?.manifest || data.manifest || data;
       }
-      const data = await res.json();
-      const manifest = data.data?.manifest || data.manifest || data;
-      if (jsonMode) return console.log(JSON.stringify(manifest, null, 2));
-      const toolName = manifest.name || manifest.slug || slug;
-      console.log(chalk.bold(`\n  ${toolName}`));
-      console.log(`  ${chalk.dim(manifest.short_description || "")}`);
-      console.log(`  Version: ${chalk.cyan(manifest.version || "1.0.0")}`);
-      console.log(`  Runtime: ${chalk.cyan(manifest.runtime || "browser")}`);
-      console.log(`  Pricing: ${chalk.cyan(manifest.pricing || "free")}`);
-      if (manifest.input_schema?.properties) {
-        console.log(chalk.bold(`\n  Input Parameters:`));
-        const props = manifest.input_schema.properties;
-        const required = manifest.input_schema.required || [];
-        for (const [name, prop] of Object.entries(props)) {
-          const req = required.includes(name) ? chalk.red(" *required") : "";
-          console.log(`    ${chalk.cyan(name)} (${prop.type})${req}`);
-          if (prop.description) console.log(`      ${chalk.dim(prop.description)}`);
-        }
+    } catch { /* API failed */ }
+
+    if (!manifest) {
+      // Try Supabase fallback
+      try {
+        const toolInfo = await fetchToolFromSupabase(slug);
+        if (toolInfo) manifest = toolInfo.manifest;
+      } catch { /* fallback failed */ }
+    }
+
+    if (!manifest) {
+      if (jsonMode) return console.log(JSON.stringify({ error: `Tool "${slug}" not found.` }));
+      console.error(chalk.red(`Tool "${slug}" not found.`));
+      return;
+    }
+
+    if (jsonMode) return console.log(JSON.stringify(manifest, null, 2));
+    const toolName = manifest.name || manifest.slug || slug;
+    console.log(chalk.bold(`\n  ${toolName}`));
+    console.log(`  ${chalk.dim(manifest.short_description || "")}`);
+    console.log(`  Version: ${chalk.cyan(manifest.version || "1.0.0")}`);
+    console.log(`  Runtime: ${chalk.cyan(manifest.runtime || "browser")}`);
+    console.log(`  Pricing: ${chalk.cyan(manifest.pricing || "free")}`);
+    if (manifest.input_schema?.properties) {
+      console.log(chalk.bold(`\n  Input Parameters:`));
+      const props = manifest.input_schema.properties;
+      const required = manifest.input_schema.required || [];
+      for (const [name, prop] of Object.entries(props)) {
+        const req = required.includes(name) ? chalk.red(" *required") : "";
+        console.log(`    ${chalk.cyan(name)} (${prop.type})${req}`);
+        if (prop.description) console.log(`      ${chalk.dim(prop.description)}`);
       }
-      if (manifest.output_schema?.properties) {
-        console.log(chalk.bold(`\n  Output:`));
-        for (const [name, prop] of Object.entries(manifest.output_schema.properties)) {
-          console.log(`    ${chalk.cyan(name)} (${prop.type})`);
-        }
+    }
+    if (manifest.output_schema?.properties) {
+      console.log(chalk.bold(`\n  Output:`));
+      for (const [name, prop] of Object.entries(manifest.output_schema.properties)) {
+        console.log(`    ${chalk.cyan(name)} (${prop.type})`);
       }
-      console.log();
-    } catch (err) {
-      if (jsonMode) return console.log(JSON.stringify({ error: err.message }));
-      console.error(chalk.red("Failed to fetch tool info:"), err.message);
     }
+    console.log();
   });
 
 // ─── `nxb transform <slug>` — pipe stdin through a tool ──────────────────────
@@ -538,6 +519,10 @@ program
         },
         body: JSON.stringify(body),
       });
+      if (!res.ok && !res.headers.get("content-type")?.includes("json")) {
+        if (!jsonMode) console.log(chalk.dim(`  API not deployed, falling back to local execution...`));
+        return await executeLocal(slug, body, jsonMode);
+      }
       const data = await res.json();
       if (data.success) {
         const output = typeof data.data === "string" ? data.data : JSON.stringify(data.data, null, 2);
@@ -549,9 +534,8 @@ program
         process.exit(1);
       }
     } catch (err) {
-      if (jsonMode) return console.log(JSON.stringify({ error: err.message }));
-      console.error(chalk.red("Transform failed:"), err.message);
-      process.exit(1);
+      if (!jsonMode) console.log(chalk.dim(`  API unreachable, falling back to local execution...`));
+      return await executeLocal(slug, body, jsonMode);
     }
   });
 
@@ -688,11 +672,13 @@ program
   .description("Show tool abbreviations")
   .argument("[query]", "Search/filter abbreviations (e.g. 'ip' shows all IP-related tools)")
   .action(async (query, opts, cmd) => {
-    try {
-      const res = await fetch(`${API_BASE}/api/tools`);
-      const { tools } = await res.json();
-      const slugs = (tools || []).map((t) => t.slug);
-      const abbrMap = generateAbbreviations(slugs);
+    const tools = await fetchToolsWithFallback();
+    if (!tools || tools.length === 0) {
+      console.log(chalk.yellow("  No tools available. Set NEXUSBLOOM_SUPABASE_ANON_KEY or deploy the API."));
+      return;
+    }
+    const slugs = tools.map((t) => t.slug);
+    const abbrMap = generateAbbreviations(slugs);
 
       // Filter by query if provided
       let filtered = slugs;
@@ -708,15 +694,12 @@ program
       }
 
       console.log(chalk.bold(`\n  Tool Abbreviations${query ? ` matching "${query}"` : ""}:\n`));
-      filtered.forEach((slug) => {
-        const tool = (tools || []).find(t => t.slug === slug);
-        const name = tool?.name || slug;
-        console.log(`  ${chalk.cyan(abbrMap[slug].padEnd(15))} → ${chalk.dim(slug.padEnd(30))} ${chalk.gray(name)}`);
-      });
-      console.log();
-    } catch (err) {
-      console.error(chalk.red("Failed to fetch tools:"), err.message);
-    }
+    filtered.forEach((slug) => {
+      const tool = (tools || []).find(t => t.slug === slug);
+      const name = tool?.name || slug;
+      console.log(`  ${chalk.cyan(abbrMap[slug].padEnd(15))} → ${chalk.dim(slug.padEnd(30))} ${chalk.gray(name)}`);
+    });
+    console.log();
   });
 
 // ─── `nxb json` — create JSON input for tools ───────────────────────────────
@@ -732,14 +715,25 @@ program
     const jsonMode = cmd.parent.opts().json;
 
     if (opts.template) {
-      // Fetch tool schema
-      const res = await fetch(`${API_BASE}/api/run/${opts.template}`);
-      if (!res.ok) {
-        console.error(chalk.red(`Tool "${opts.template}" not found`));
+      // Fetch tool schema — try API first, then Supabase
+      let manifest = null;
+      try {
+        const res = await fetch(`${API_BASE}/api/run/${opts.template}`);
+        if (res.ok) {
+          const data = await res.json();
+          manifest = data.data?.manifest || data.manifest || data;
+        }
+      } catch { /* API failed */ }
+
+      if (!manifest) {
+        const toolInfo = await fetchToolFromSupabase(opts.template);
+        if (toolInfo) manifest = toolInfo.manifest;
+      }
+
+      if (!manifest) {
+        console.error(chalk.red(`Tool "${opts.template}" not found. Set NEXUSBLOOM_SUPABASE_ANON_KEY or deploy the API.`));
         process.exit(1);
       }
-      const data = await res.json();
-      const manifest = data.data?.manifest || data.manifest || data;
       const schema = manifest.input_schema || {};
 
       let result = {};
@@ -828,6 +822,158 @@ program
     }
   });
 
+// ─── Supabase Helpers ─────────────────────────────────────────────────────────
+
+const SUPABASE_URL_DEFAULT = "https://dhxaqatmuprehrkszxzs.supabase.co";
+const SUPABASE_ANON_KEY_DEFAULT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImRoeGFxYXRtdXByZWhya3N6eHpzIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzMxNjIzNTQsImV4cCI6MjA4ODczODM1NH0.pq7DxW66ETQt6QlIAu2WiLO08tfA7JHQVPd2SvvA3sM";
+
+function getSupabaseKey() {
+  return process.env.NEXUSBLOOM_SUPABASE_ANON_KEY 
+    || configGet("supabaseKey") 
+    || SUPABASE_ANON_KEY_DEFAULT;
+}
+
+function getSupabaseUrl() {
+  return process.env.NEXUSBLOOM_SUPABASE_URL 
+    || SUPABASE_URL_DEFAULT;
+}
+
+function supabaseHeaders() {
+  const key = getSupabaseKey();
+  return { apikey: key, Authorization: `Bearer ${key}` };
+}
+
+/**
+ * Fetch tool list from Supabase directly (fallback when API is down).
+ * Returns array of {slug, name, short_description, category, runtime, version, icon} or null.
+ */
+async function fetchToolsFromSupabase() {
+  const headers = supabaseHeaders();
+  const supabaseUrl = getSupabaseUrl();
+  try {
+    const res = await fetch(
+      `${supabaseUrl}/rest/v1/tools?select=slug,name,short_description,tool_type,runtime,version,icon&published=eq.true&order=name.asc`,
+      { headers }
+    );
+    if (!res.ok) return null;
+    const tools = await res.json();
+    if (!Array.isArray(tools)) return null;
+
+    // Also fetch community tools
+    const communityRes = await fetch(
+      `${supabaseUrl}/rest/v1/community_tools?select=slug,name,short_description,category,version,icon,author_id&status=eq.published&order=name.asc`,
+      { headers }
+    );
+    const communityTools = communityRes.ok ? (await communityRes.json()) : [];
+
+    const allTools = [
+      ...tools.map(t => ({
+        slug: t.slug,
+        name: t.name,
+        description: t.short_description || "",
+        category: t.tool_type || "uncategorized",
+        runtime: t.runtime || "both",
+        version: t.version || "1.0.0",
+        icon: t.icon || "🔧",
+        type: "builtin",
+      })),
+      ...communityTools.map(t => ({
+        slug: t.slug,
+        name: t.name,
+        description: t.short_description || "",
+        category: t.category || "uncategorized",
+        runtime: "both",
+        version: t.version || "1.0.0",
+        icon: t.icon || "🛠️",
+        type: "community",
+        author_id: t.author_id,
+      })),
+    ];
+
+    return allTools;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Fetch a single tool's v2_source from Supabase (fallback).
+ * Returns {manifest, coreLogicSource, v2Source} or null.
+ */
+async function fetchToolFromSupabase(slug) {
+  const headers = supabaseHeaders();
+  const supabaseUrl = getSupabaseUrl();
+  try {
+    // Try builtin tools first
+    const toolRes = await fetch(
+      `${supabaseUrl}/rest/v1/tools?slug=eq.${slug}&select=id&published=eq.true`,
+      { headers }
+    );
+    let tools = await toolRes.json();
+    let toolId = tools?.[0]?.id;
+    let toolType = "builtin";
+
+    // Fall back to community tools
+    if (!toolId) {
+      const comRes = await fetch(
+        `${supabaseUrl}/rest/v1/community_tools?slug=eq.${slug}&select=id&status=eq.published`,
+        { headers }
+      );
+      const comTools = await comRes.json();
+      toolId = comTools?.[0]?.id;
+      toolType = "community";
+    }
+
+    if (!toolId) return null;
+
+    const versionRes = await fetch(
+      `${supabaseUrl}/rest/v1/tool_versions?tool_id=eq.${toolId}&tool_type=eq.${toolType}&status=eq.published&select=v2_source&order=created_at.desc&limit=1`,
+      { headers }
+    );
+    const versions = await versionRes.json();
+    const v2Source = versions?.[0]?.v2_source;
+    if (!v2Source) return null;
+
+    const manifestMatch = v2Source.match(/export\s+const\s+MANIFEST\s*=\s*({[\s\S]*?});\s*\n/);
+    let manifest = null;
+    if (manifestMatch) {
+      try {
+        manifest = new Function("return " + manifestMatch[1])();
+      } catch {
+        try {
+          manifest = JSON.parse(manifestMatch[1].replace(/(\w+):/g, '"$1":').replace(/'/g, '"'));
+        } catch {
+          manifest = eval("(" + manifestMatch[1] + ")");
+        }
+      }
+    }
+    return { manifest, coreLogicSource: v2Source, v2Source };
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Try API first, fall back to Supabase. Returns array or null.
+ */
+async function fetchToolsWithFallback() {
+  // Try API first
+  try {
+    const url = new URL("/api/tools", API_BASE);
+    const res = await fetch(url);
+    const ct = res.headers.get("content-type") || "";
+    if (ct.includes("json")) {
+      const { tools } = await res.json();
+      if (Array.isArray(tools) && tools.length > 0) return tools;
+    }
+  } catch { /* API failed */ }
+
+  // Fall back to Supabase
+  const supabaseTools = await fetchToolsFromSupabase();
+  if (supabaseTools) return supabaseTools;
+  return null;
+}
+
 // ─── Helpers ─────────────────────────────────────────────────────────────────
 
 function readStdin() {