@tianmucreations/jeeves 0.2.1 → 0.3.0

package/dist/providers/index.js

@@ -1,6 +1,13 @@
-import { createOpenRouterProvider, fetchCreditInfo } from './openrouter.js';
+import { createOpenRouterProvider, fetchCreditInfo, fetchKeyUsage } from './openrouter.js';
+import { getSpendReading, setSpendReading } from '../platform/config.js';
+import { nextSpendReading, spentToday } from '../state/today-spend.js';
 import { createOllamaProvider } from './ollama.js';
 import { createZaiProvider } from './zai.js';
+import { createDirectProvider, createCustomProvider } from './direct.js';
+import { DIRECT_SERVICES, CUSTOM_SERVICE_ID, directService, isDirectService, serviceNameFor } from './direct-services.js';
+import { checkKey, checkCustomService, forgetLiveList, loadCatalogue } from './catalogue.js';
+import { getCustomService, setCustomService, getEstimatedSpend } from '../platform/config.js';
+import { localDate } from '../state/today-spend.js';
 import { session } from '../state/session.js';
 import { getKey, setKey, deleteKey, listProviders } from '../keys/store.js';
 import { existsSync, readFileSync, rmSync } from 'node:fs';
@@ -10,17 +17,24 @@ let active = null;
 let resolvedKey = null;
 let zaiKey = null;
 let keySource = null;
+// Keys for the direct connections and the "any compatible service", by service id.
+const serviceKeys = new Map();
+// The OpenRouter key, for features that call OpenRouter directly (web research).
+export function getOpenRouterKey() {
+    return resolvedKey;
+}
 // The calm provider list shared by the model picker and the key screens.
 export const PROVIDER_ROWS = [
     { id: 'openrouter', label: 'OpenRouter', description: 'one key unlocks 400+ models - recommended' },
     { id: 'zai', label: 'Z.ai', description: 'GLM Coding Plan - $18/month flat - best for heavy daily use' },
-    { id: 'anthropic', label: 'Anthropic', description: 'direct connection' },
-    { id: 'openai', label: 'OpenAI', description: 'direct connection' },
-    { id: 'google', label: 'Google', description: 'direct connection' },
-    { id: 'xai', label: 'xAI', description: 'direct connection' },
-    { id: 'groq', label: 'Groq', description: 'direct connection' },
-    { id: 'mistral', label: 'Mistral', description: 'direct connection' },
-    { id: 'ollama', label: 'Ollama', description: 'local models, no key needed' },
+    { id: 'anthropic', label: 'Anthropic', description: 'Claude, with your own Anthropic key' },
+    { id: 'openai', label: 'OpenAI', description: 'GPT, with your own OpenAI key' },
+    { id: 'google', label: 'Google', description: 'Gemini, with your own Google AI Studio key' },
+    { id: 'xai', label: 'xAI (Grok)', description: 'Grok, with your own xAI key' },
+    { id: 'groq', label: 'Groq', description: 'fast open models, with your own Groq key' },
+    { id: 'mistral', label: 'Mistral', description: 'Mistral, with your own Mistral key' },
+    { id: 'custom', label: 'Other service', description: 'any compatible service - paste its address and key' },
+    { id: 'ollama', label: 'Ollama', description: 'models on this computer, no key needed' },
 ];
 export function getKeySource() {
     return keySource;
@@ -33,8 +47,60 @@ export function hasCredentialsFor(providerId) {
         return zaiKey !== null;
     if (providerId === 'ollama')
         return true;
+    if (providerId === CUSTOM_SERVICE_ID)
+        return serviceKeys.has(CUSTOM_SERVICE_ID) && getCustomService() !== null;
+    if (isDirectService(providerId))
+        return serviceKeys.has(providerId);
     return false;
 }
+// Uses a key for this session only, without saving it (the bench and tests; never the keychain).
+export function useKeyForThisSession(providerId, key) {
+    serviceKeys.set(providerId, key);
+}
+// A compatible service may need no key (one running on this computer); this stands in.
+export const NO_KEY = 'no-key';
+// The key for a direct connection or the compatible service, if one is stored.
+export function serviceKey(providerId) {
+    return serviceKeys.get(providerId) ?? null;
+}
+// The name of the compatible service, from its address ("Other service" before one is added).
+export function customServiceName() {
+    const saved = getCustomService();
+    return saved ? serviceNameFor(saved.baseURL) : 'Other service';
+}
+// Checks a key with the company (a free request for its model list), then stores it.
+// A key the company refuses is not stored; when the company can't be reached the key
+// is stored anyway and the person is told it could not be checked.
+export async function storeDirectKey(serviceId, key) {
+    const check = await checkKey(serviceId, key);
+    if (!check.ok && check.reason === 'rejected')
+        return 'rejected';
+    if (!(await setKey(serviceId, key)))
+        return 'keychain';
+    serviceKeys.set(serviceId, key);
+    forgetLiveList(serviceId);
+    return check.ok ? 'saved' : 'saved-unchecked';
+}
+export async function removeServiceKey(serviceId) {
+    await deleteKey(serviceId);
+    serviceKeys.delete(serviceId);
+    forgetLiveList(serviceId);
+    if (serviceId === CUSTOM_SERVICE_ID)
+        setCustomService(null);
+}
+// Checks the compatible service's address and key together (it must list its models),
+// then stores both. A blank key is allowed for a service on this computer.
+export async function storeCustomService(address, key) {
+    const secret = key.trim() || NO_KEY;
+    const check = await checkCustomService(address, secret);
+    if (!check.ok)
+        return check.reason;
+    if (!(await setKey(CUSTOM_SERVICE_ID, secret)))
+        return 'keychain';
+    setCustomService({ baseURL: check.baseURL });
+    serviceKeys.set(CUSTOM_SERVICE_ID, secret);
+    return check.keyChecked ? 'saved' : 'saved-unchecked';
+}
 export function hasCredentials() {
     return hasCredentialsFor(session.providerId);
 }
@@ -42,6 +108,14 @@ export function hasCredentials() {
 // that gets migrated into the Keychain on first launch. The first access may pop a
 // macOS permission dialog - that is expected and allowed once.
 export async function initKeys() {
+    // Read together, so startup is not held up by one keychain read after another.
+    const ids = [...DIRECT_SERVICES.map((service) => service.id), CUSTOM_SERVICE_ID];
+    const serviceStored = await Promise.all(ids.map((id) => getKey(id)));
+    ids.forEach((id, index) => {
+        const key = serviceStored[index];
+        if (key && key.length > 0)
+            serviceKeys.set(id, key);
+    });
     const storedZai = await getKey('zai');
     if (storedZai && storedZai.length > 0) {
         zaiKey = storedZai;
@@ -57,10 +131,10 @@ export async function initKeys() {
         const moved = await setKey('openrouter', envKey);
         if (moved) {
             removeEnvFile();
-            session.addNotice('Your API key was moved from the .env file into your Mac keychain. The .env file has been removed.');
+            session.addNotice('Your key was moved from a local file into your Mac keychain, and the file was removed.');
         }
         else {
-            session.addNotice('The Mac keychain was not reachable, so the .env development file is being used. Run /keys to store the key securely.');
+            session.addNotice('The Mac keychain was not reachable, so the key is being read from a local file for now. Type /keys to store it securely.');
         }
         resolvedKey = envKey;
         keySource = moved ? 'keychain' : 'env';
@@ -126,12 +200,27 @@ export function getActiveProvider() {
     }
     if (session.providerId === 'zai') {
         if (!zaiKey) {
-            throw new Error('No Z.ai key found. Add one with /keys.');
+            throw new Error('No Z.ai key yet. Add one with /keys.');
         }
         return createZaiProvider(zaiKey);
     }
+    if (session.providerId === CUSTOM_SERVICE_ID) {
+        const saved = getCustomService();
+        const key = serviceKeys.get(CUSTOM_SERVICE_ID);
+        if (!saved || !key)
+            throw new Error('No key yet for the other service. Add one with /model.');
+        return createCustomProvider(saved.baseURL, key);
+    }
+    if (isDirectService(session.providerId)) {
+        const key = serviceKeys.get(session.providerId);
+        if (!key)
+            throw new Error(`No ${directService(session.providerId).label} key yet. Add one with /keys.`);
+        // Prices for the cost estimate; loads once, and never fails.
+        void loadCatalogue();
+        return createDirectProvider(session.providerId, key);
+    }
     if (!resolvedKey) {
-        throw new Error('No OpenRouter API key found. Add one with /keys.');
+        throw new Error('No OpenRouter API key yet. Add one with /keys.');
     }
     if (!active) {
         active = createOpenRouterProvider(resolvedKey);
@@ -142,8 +231,12 @@ export function getActiveProvider() {
 // the inference key only sees its own spending cap, which is labelled as such.
 // Local Ollama has no credit balance, and failures are silent.
 export async function refreshCredit() {
-    if (session.providerId !== 'openrouter')
+    if (session.providerId !== 'openrouter') {
+        // Direct connections: today's spending as worked out from price lists.
+        session.setTodaySpend(Math.max(session.todaySpend ?? 0, estimatedToday()));
         return;
+    }
+    void refreshTodaySpend();
     const managementKey = await getKey('openrouter-management');
     if (managementKey) {
         const info = await fetchCreditInfo(managementKey);
@@ -159,6 +252,23 @@ export async function refreshCredit() {
         session.setCredit(info.used, info.limit, info.remaining, false);
     }
 }
+// Today's spend on the key Jeeves uses, in the user's local calendar day.
+async function refreshTodaySpend() {
+    if (!resolvedKey)
+        return;
+    const usage = await fetchKeyUsage(resolvedKey);
+    if (usage === null)
+        return;
+    const reading = nextSpendReading(getSpendReading(), usage, new Date());
+    setSpendReading(reading);
+    // Never lower than the live figure: the key's total can lag a request or two behind.
+    session.setTodaySpend(Math.max(session.todaySpend ?? 0, spentToday(reading) + estimatedToday()));
+}
+// Today's spending on direct connections, worked out from price lists.
+export function estimatedToday(now = new Date()) {
+    const saved = getEstimatedSpend();
+    return saved && saved.date === localDate(now) ? saved.amount : 0;
+}
 // Which providers have a key in the OS credential store.
 export async function storedKeyProviders() {
     return listProviders();