ai-speedometer 2.0.4 → 2.1.0

package/dist/ai-speedometer

@@ -1,4 +1,9 @@
-#!/usr/bin/env bun
+#!/bin/sh -
+':'; /*-
+test1=$(bun --version 2>&1) && exec bun "$0" "$@"
+test2=$(node --version 2>&1) && exec node "$0" "$@"
+exec printf '%s\n' "$test1" "$test2" 1>&2
+*/
 // @bun
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -1474,61 +1479,85 @@ var getXDGPaths = () => ({
   }
   return merged;
 }, getOpencodeGlobalConfigProviders = async () => {
+  return getAuthenticatedProviders();
+}, getAuthenticatedProviders = async () => {
   try {
-    const globalConfig = readOpencodeGlobalConfig();
-    if (!globalConfig.provider || Object.keys(globalConfig.provider).length === 0)
-      return [];
-    const allModelsDevProviders = await getAllProviders();
-    const result = [];
-    for (const [providerId, entry] of Object.entries(globalConfig.provider)) {
-      const apiKey = entry.options?.apiKey;
-      if (!apiKey)
-        continue;
-      const mdProvider = allModelsDevProviders.find((p) => p.id === providerId);
-      let models = [];
-      if (entry.models && Object.keys(entry.models).length > 0) {
-        models = Object.entries(entry.models).map(([modelKey, m]) => ({
-          id: `${providerId}_${m.id ?? modelKey}`,
-          name: m.name ?? m.id ?? modelKey
-        }));
-      } else if (mdProvider) {
-        models = mdProvider.models.map((m) => ({ id: `${providerId}_${m.id}`, name: m.name }));
+    const [allModelsDevProviders, authData, globalConfig] = await Promise.all([
+      getAllProviders(),
+      readAuthJson(),
+      Promise.resolve(readOpencodeGlobalConfig())
+    ]);
+    const database = new Map;
+    for (const mdProvider of allModelsDevProviders) {
+      const modelMap = new Map;
+      for (const m of mdProvider.models) {
+        modelMap.set(`${mdProvider.id}_${m.id}`, { id: `${mdProvider.id}_${m.id}`, name: m.name });
       }
-      const npm = entry.npm ?? mdProvider?.type;
-      const type = npm?.includes("anthropic") ? "anthropic" : mdProvider?.type ?? "openai-compatible";
-      result.push({
-        id: providerId,
-        name: entry.name ?? mdProvider?.name ?? providerId,
-        type,
-        baseUrl: entry.options?.baseURL ?? entry.api ?? mdProvider?.baseUrl ?? "",
-        apiKey,
-        models
+      database.set(mdProvider.id, {
+        id: mdProvider.id,
+        name: mdProvider.name,
+        type: mdProvider.type,
+        baseUrl: mdProvider.baseUrl,
+        models: modelMap
       });
     }
-    return result;
-  } catch (error) {
-    console.warn("Warning: Could not load opencode global config providers:", error.message);
-    return [];
-  }
-}, getAuthenticatedProviders = async () => {
-  const authData = await readAuthJson();
-  const allProviders = await getAllProviders();
-  const authenticatedProviders = [];
-  for (const [providerId, authInfo] of Object.entries(authData)) {
-    const providerInfo = allProviders.find((p) => p.id === providerId);
-    if (providerInfo && authInfo.type === "api" && authInfo.key) {
-      const models = await getModelsForProvider(providerId);
-      authenticatedProviders.push({
-        id: providerId,
-        name: providerInfo.name,
-        type: providerInfo.type,
-        baseUrl: providerInfo.baseUrl,
+    for (const [providerID, entry] of Object.entries(globalConfig.provider ?? {})) {
+      const existing = database.get(providerID);
+      const modelMap = existing ? new Map(existing.models) : new Map;
+      for (const [modelKey, m] of Object.entries(entry.models ?? {})) {
+        const resolvedId = `${providerID}_${m.id ?? modelKey}`;
+        modelMap.set(resolvedId, { id: resolvedId, name: m.name ?? m.id ?? modelKey });
+      }
+      database.set(providerID, {
+        id: providerID,
+        name: entry.name ?? existing?.name ?? providerID,
+        type: existing?.type ?? "openai-compatible",
+        baseUrl: entry.options?.baseURL ?? entry.api ?? existing?.baseUrl ?? "",
+        models: modelMap,
+        npm: entry.npm
+      });
+    }
+    const providerMap = new Map;
+    for (const [providerID, authInfo] of Object.entries(authData)) {
+      if (authInfo.type !== "api" || !authInfo.key)
+        continue;
+      const dbEntry = database.get(providerID);
+      if (!dbEntry)
+        continue;
+      const configEntry = globalConfig.provider?.[providerID];
+      const npm = dbEntry.npm ?? configEntry?.npm;
+      const type = npm?.includes("anthropic") ? "anthropic" : dbEntry.type;
+      providerMap.set(providerID, {
+        id: providerID,
+        name: dbEntry.name,
+        type,
+        baseUrl: dbEntry.baseUrl,
         apiKey: authInfo.key,
-        models: models.map((model) => ({ name: model.name, id: `${providerId}_${model.id}` }))
+        models: Array.from(dbEntry.models.values())
       });
     }
+    for (const [providerID, entry] of Object.entries(globalConfig.provider ?? {})) {
+      if (!entry.options?.apiKey)
+        continue;
+      const dbEntry = database.get(providerID);
+      if (!dbEntry)
+        continue;
+      const npm = dbEntry.npm ?? entry.npm;
+      const type = npm?.includes("anthropic") ? "anthropic" : dbEntry.type;
+      providerMap.set(providerID, {
+        id: providerID,
+        name: dbEntry.name,
+        type,
+        baseUrl: dbEntry.baseUrl,
+        apiKey: entry.options.apiKey,
+        models: Array.from(dbEntry.models.values())
+      });
+    }
+    return Array.from(providerMap.values());
+  } catch (error) {
+    console.warn("Warning: Could not load providers:", error.message);
+    return [];
   }
-  return authenticatedProviders;
 }, getCustomProviders = async () => [], verifyProvider = async (providerId) => {
   try {
     const allProviders = await getAllProviders();
@@ -1549,7 +1578,7 @@ var getXDGPaths = () => ({
   }
   return true;
 }, getAllAvailableProviders = async (includeAllProviders = false) => {
-  const [authenticatedProviders, customProvidersFromConfig, customVerifiedProviders, opencodeGlobalProviders] = await Promise.all([
+  const [opencodeProviders, customProvidersFromConfig, customVerifiedProviders] = await Promise.all([
     getAuthenticatedProviders(),
     (async () => {
       try {
@@ -1566,18 +1595,16 @@ var getXDGPaths = () => ({
         console.warn("Warning: Could not load custom verified providers:", error.message);
         return [];
       }
-    })(),
-    getOpencodeGlobalConfigProviders()
+    })()
   ]);
   const providerMap = new Map;
   customVerifiedProviders.forEach((p) => providerMap.set(p.id, p));
-  opencodeGlobalProviders.forEach((p) => providerMap.set(p.id, p));
+  opencodeProviders.forEach((p) => providerMap.set(p.id, p));
   customProvidersFromConfig.forEach((p) => providerMap.set(p.id, p));
-  authenticatedProviders.forEach((p) => providerMap.set(p.id, p));
   if (includeAllProviders) {
     try {
       const allModelsDevProviders = await getAllProviders();
-      const authenticatedIds = new Set(authenticatedProviders.map((p) => p.id));
+      const authenticatedIds = new Set(opencodeProviders.map((p) => p.id));
       const customIds = new Set(customProvidersFromConfig.map((p) => p.id));
       const customVerifiedIds = new Set(customVerifiedProviders.map((p) => p.id));
       allModelsDevProviders.forEach((provider) => {
@@ -2127,14 +2154,15 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "ai-speedometer",
-    version: "2.0.4",
+    version: "2.1.0",
     description: "A comprehensive CLI tool for benchmarking AI models across multiple providers with parallel execution and professional metrics",
     bin: {
       "ai-speedometer": "dist/ai-speedometer",
       aispeed: "dist/ai-speedometer"
     },
     engines: {
-      bun: ">=1.0.0"
+      bun: ">=1.0.0",
+      node: ">=18.0.0"
     },
     scripts: {
       start: "bun src/index.ts",
@@ -2143,7 +2171,7 @@ var init_package = __esm(() => {
       "test:watch": "bun test --watch",
       "test:update": "bun test --update-snapshots",
       typecheck: "bun tsc --noEmit",
-      build: "bun build src/index.ts --outdir dist --target bun --external '@opentui/core' --external '@opentui/react' --external 'react' --external 'react-reconciler' && printf '#!/usr/bin/env bun\\n' | cat - dist/index.js > dist/ai-speedometer && chmod +x dist/ai-speedometer && rm dist/index.js",
+      build: "bun build src/index.ts --outdir dist --target bun --external '@opentui/core' --external '@opentui/react' --external 'react' --external 'react-reconciler' && cat scripts/shebang dist/index.js > dist/ai-speedometer && chmod +x dist/ai-speedometer && rm dist/index.js",
       prepublishOnly: "bun run build"
     },
     keywords: [
@@ -2174,6 +2202,7 @@ var init_package = __esm(() => {
     files: [
       "dist/",
       "docs/",
+      "scripts/",
       "README.md",
       "ai-benchmark-config.json.template"
     ],

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "ai-speedometer",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "A comprehensive CLI tool for benchmarking AI models across multiple providers with parallel execution and professional metrics",
   "bin": {
     "ai-speedometer": "dist/ai-speedometer",
     "aispeed": "dist/ai-speedometer"
   },
   "engines": {
-    "bun": ">=1.0.0"
+    "bun": ">=1.0.0",
+    "node": ">=18.0.0"
   },
   "scripts": {
     "start": "bun src/index.ts",
@@ -16,7 +17,7 @@
     "test:watch": "bun test --watch",
     "test:update": "bun test --update-snapshots",
     "typecheck": "bun tsc --noEmit",
-    "build": "bun build src/index.ts --outdir dist --target bun --external '@opentui/core' --external '@opentui/react' --external 'react' --external 'react-reconciler' && printf '#!/usr/bin/env bun\\n' | cat - dist/index.js > dist/ai-speedometer && chmod +x dist/ai-speedometer && rm dist/index.js",
+    "build": "bun build src/index.ts --outdir dist --target bun --external '@opentui/core' --external '@opentui/react' --external 'react' --external 'react-reconciler' && cat scripts/shebang dist/index.js > dist/ai-speedometer && chmod +x dist/ai-speedometer && rm dist/index.js",
     "prepublishOnly": "bun run build"
   },
   "keywords": [
@@ -47,6 +48,7 @@
   "files": [
     "dist/",
     "docs/",
+    "scripts/",
     "README.md",
     "ai-benchmark-config.json.template"
   ],

package/scripts/shebang

@@ -0,0 +1,6 @@
+#!/bin/sh -
+':'; /*-
+test1=$(bun --version 2>&1) && exec bun "$0" "$@"
+test2=$(node --version 2>&1) && exec node "$0" "$@"
+exec printf '%s\n' "$test1" "$test2" 1>&2
+*/