@ducci/jarvis 1.0.96 → 1.0.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ducci/jarvis",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "description": "A fully automated agent system that lives on a server.",
   "main": "./src/index.js",
   "type": "module",

package/src/scripts/onboarding.js

@@ -121,6 +121,7 @@ async function run() {
         { name: 'OpenRouter (access many models via one key)', value: 'openrouter' },
         { name: 'Anthropic Direct (use your Anthropic API key)', value: 'anthropic' },
         { name: 'Z.AI Direct (GLM models, use your Z.AI API key)', value: 'z-ai' },
+        { name: 'OpenAI-compatible (any provider with an OpenAI-compatible API)', value: 'openai-compatible' },
       ],
       default: settings.provider || 'openrouter',
     }
@@ -187,6 +188,46 @@ async function run() {
       saveEnvVar('ZAI_API_KEY', apiKey);
       console.log(chalk.green('Z.AI API key saved.'));
     }
+  } else if (provider === 'openai-compatible') {
+    const { baseURL } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'baseURL',
+        message: 'Enter the base URL of the OpenAI-compatible API (e.g., https://api.example.com/v1):',
+        default: settings.customBaseURL || '',
+        validate: (input) => input.trim().length > 0 || 'Base URL cannot be empty.',
+      }
+    ]);
+    settings.customBaseURL = baseURL.trim();
+
+    const existingKey = loadEnvVar('CUSTOM_API_KEY');
+    apiKey = existingKey;
+
+    if (existingKey) {
+      const { keepKey } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'keepKey',
+          message: 'A CUSTOM_API_KEY is already configured. Do you want to keep it?',
+          default: true,
+        }
+      ]);
+      if (!keepKey) apiKey = null;
+    }
+
+    if (!apiKey) {
+      const { newKey } = await inquirer.prompt([
+        {
+          type: 'password',
+          name: 'newKey',
+          message: 'Enter your API key:',
+          validate: (input) => input.length >= 1 || 'API key cannot be empty.',
+        }
+      ]);
+      apiKey = newKey;
+      saveEnvVar('CUSTOM_API_KEY', apiKey);
+      console.log(chalk.green('API key saved.'));
+    }
   } else {
     const existingKey = loadEnvVar('OPENROUTER_API_KEY');
     apiKey = existingKey;
@@ -238,7 +279,17 @@ async function run() {
   }
 
   if (!selectedModel) {
-    if (provider === 'z-ai') {
+    if (provider === 'openai-compatible') {
+      const { manualModel } = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'manualModel',
+          message: 'Enter model ID (e.g., gpt-4o, mistral-large):',
+          validate: (input) => input.trim().length > 0 || 'Model ID cannot be empty.',
+        }
+      ]);
+      selectedModel = manualModel.trim();
+    } else if (provider === 'z-ai') {
       const models = await fetchZaiModels(apiKey);
       let choices;
       if (models.length > 0) {
@@ -374,8 +425,37 @@ async function run() {
   if (!settings.fallbackModel || previousProvider !== provider) {
     if (provider === 'anthropic') settings.fallbackModel = 'claude-haiku-4-5-20251001';
     else if (provider === 'z-ai') settings.fallbackModel = 'glm-4-flash';
+    else if (provider === 'openai-compatible') settings.fallbackModel = null;
     else settings.fallbackModel = 'openrouter/free';
   }
+
+  if (provider === 'openai-compatible') {
+    const currentFallback = settings.fallbackModel;
+    if (currentFallback) {
+      const { keepFallback } = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'keepFallback',
+          message: `Current fallback model is ${chalk.yellow(currentFallback)}. Keep it or change it?`,
+          choices: [
+            { name: 'Keep current fallback model', value: true },
+            { name: 'Change fallback model', value: false },
+          ],
+        }
+      ]);
+      if (!keepFallback) settings.fallbackModel = null;
+    }
+    if (!settings.fallbackModel) {
+      const { fallbackModel } = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'fallbackModel',
+          message: 'Enter fallback model ID (leave empty to skip):',
+        }
+      ]);
+      settings.fallbackModel = fallbackModel.trim() || null;
+    }
+  }
   if (settings.maxIterations === undefined) {
     settings.maxIterations = 20;
   }

package/src/server/agent.js

@@ -150,6 +150,9 @@ async function callModelWithFallback(client, config, messages, tools) {
   } catch (err) {
     primaryErr = err;
   }
+  if (!config.fallbackModel) {
+    throw primaryErr;
+  }
   try {
     return await callModel(client, config.fallbackModel, messages, tools);
   } catch (fallbackErr) {
@@ -536,8 +539,9 @@ export async function runAgentLoop(client, config, session, prepareMessages, usa
       try {
         parsed = JSON.parse(sanitizeJson(content));
       } catch {
-        // Step 1: retry with fallback model
+        // Step 1: retry with fallback model (if configured)
         try {
+          if (!config.fallbackModel) throw new Error('no fallback model configured');
           const fallbackResult = await callModel(client, config.fallbackModel, preparedMessages, toolDefs);
           accumulateUsage(usageAccum, fallbackResult);
           const fallbackContent = fallbackResult.choices[0]?.message?.content || '';
@@ -782,6 +786,7 @@ async function _runHandleChat(config, sessionId, userMessage, attachments = [],
   } else {
     userContent = userMessageWithContext;
   }
+  const interactionStartIndex = session.messages.length;
   session.messages.push({ role: 'user', content: userContent });
   session.metadata.handoffCount = 0;
   session.metadata.failedApproaches = [];
@@ -820,7 +825,7 @@ async function _runHandleChat(config, sessionId, userMessage, attachments = [],
       // Safety check: if the last two assistant messages are both model_error
       // synthetic notes, we are in a confirmed failure loop. Escalate immediately
       // rather than burning more iterations on a stuck session.
-      if (hasConsecutiveModelErrors(session.messages)) {
+      if (hasConsecutiveModelErrors(session.messages.slice(interactionStartIndex))) {
         finalResponse = 'The model has failed twice in a row. This is likely due to the conversation being too long for the model to process. Please start a new session or switch to a model with a larger context window.';
         finalLogSummary = 'Consecutive model_error detected: session escalated to intervention_required without running another agent loop.';
         finalStatus = 'intervention_required';

package/src/server/config.js

@@ -50,6 +50,10 @@ export function loadConfig() {
   } else if (provider === 'z-ai') {
     apiKey = process.env.ZAI_API_KEY;
     if (!apiKey) throw new Error('ZAI_API_KEY not found. Add it to ~/.jarvis/.env first.');
+  } else if (provider === 'openai-compatible') {
+    apiKey = process.env.CUSTOM_API_KEY;
+    if (!apiKey) throw new Error('CUSTOM_API_KEY not found. Run `jarvis setup` first.');
+    if (!settings.customBaseURL) throw new Error('customBaseURL not set in settings.json. Run `jarvis setup` first.');
   } else {
     apiKey = process.env.OPENROUTER_API_KEY;
     if (!apiKey) throw new Error('OPENROUTER_API_KEY not found. Run `jarvis setup` first.');
@@ -71,8 +75,9 @@ export function loadConfig() {
   return {
     provider,
     apiKey,
+    baseURL: settings.customBaseURL || null,
     selectedModel: settings.selectedModel,
-    fallbackModel: settings.fallbackModel || (provider === 'anthropic' ? 'claude-haiku-4-5-20251001' : 'openrouter/free'),
+    fallbackModel: settings.fallbackModel || (provider === 'anthropic' ? 'claude-haiku-4-5-20251001' : provider === 'openai-compatible' ? null : 'openrouter/free'),
     maxIterations: settings.maxIterations || 20,
     maxHandoffs: settings.maxHandoffs || 3,
     messageWindow: settings.messageWindow || 300,

package/src/server/provider.js

@@ -155,6 +155,12 @@ export function createClient(config) {
       apiKey: config.apiKey,
     });
   }
+  if (config.provider === 'openai-compatible') {
+    return new OpenAI({
+      baseURL: config.baseURL,
+      apiKey: config.apiKey,
+    });
+  }
   // Default: OpenRouter (OpenAI-compatible)
   return new OpenAI({
     baseURL: 'https://openrouter.ai/api/v1',