@dubeyvishal/orbital-cli 1.6.13 → 1.6.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubeyvishal/orbital-cli",
-  "version": "1.6.13",
+  "version": "1.6.14",
   "description": "A fullstack CLI-based AI platform with chat mode, multi-tool agents, and agentic AI workflows. Includes GitHub login with device authorization, secure authentication, and modular client–server architecture for building intelligent automation tools.",
   "author": "Vishal Dubey",
   "license": "MIT",
@@ -21,6 +21,8 @@
   },
   "dependencies": {
     "@ai-sdk/google": "^3.0.6",
+    "@ai-sdk/openai": "^4.0.57",
+    "@ai-sdk/xai": "^4.0.54",
     "@clack/prompts": "^0.11.0",
     "ai": "^6.0.29",
     "boxen": "^8.0.1",
@@ -49,4 +51,4 @@
     "client-server",
     "javascript"
   ]
-}
+}

package/server/src/cli/ai/googleService.js

@@ -1,11 +1,19 @@
-import { google } from "@ai-sdk/google";
 import { streamText, generateObject } from "ai";
 import { config } from "../../config/googleConfig.js";
 import chalk from "chalk";
-import { requireGeminiApiKeySync } from "../../lib/orbitalConfig.js";
+import {
+  normalizeProviderName,
+  getSelectedModelSync,
+} from "../../lib/orbitalConfig.js";
+import {
+  AI_PROVIDERS,
+  createModelInstance,
+  getModelDisplayName,
+  parseModelChoice,
+} from "../../config/aiConfig.js";
 
 const MAX_RETRIES = 3;
-const BASE_DELAY_MS = 5000; // 5 seconds
+const BASE_DELAY_MS = 3000; // 3 seconds
 
 const isRateLimitError = (error) => {
   if (!error) return false;
@@ -23,12 +31,30 @@ const isRateLimitError = (error) => {
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 export class AIService {
-  constructor() {
-    const apiKey = requireGeminiApiKeySync();
+  constructor(modelConfig = null) {
+    let resolved;
+
+    if (modelConfig) {
+      resolved = parseModelChoice(modelConfig);
+    } else {
+      const saved = getSelectedModelSync();
+      const provider = process.env.ORBITAL_PROVIDER || saved?.provider || "gemini";
+      const model =
+        process.env.ORBITAL_MODEL ||
+        saved?.model ||
+        AI_PROVIDERS[normalizeProviderName(provider)]?.defaultModel ||
+        "gemini-2.5-flash";
+      resolved = { provider: normalizeProviderName(provider), model };
 
-    this.model = google(config.model, {
-      apiKey,
-    });
+    }
+
+    this.provider = resolved.provider;
+    this.modelName = resolved.model;
+    this.model = createModelInstance(this.provider, this.modelName);
+  }
+
+  getDisplayName() {
+    return getModelDisplayName(this.provider, this.modelName);
   }
 
   async sendMessage(messages, onChunk, tools = undefined, onToolCall = null) {
@@ -45,22 +71,28 @@ export class AIService {
         if (tools && Object.keys(tools).length > 0) {
           streamConfig.tools = tools;
           streamConfig.maxSteps = 5;
-          if (attempt === 1) {
-            console.log(
-              chalk.gray(
-                `[DEBUG] Tools enabled: ${Object.keys(tools).join(", ")}`
-              )
-            );
-          }
         }
 
         const result = await streamText(streamConfig);
 
         let fullResponse = "";
 
-        for await (const chunk of result.textStream) {
-          fullResponse += chunk;
-          if (onChunk) onChunk(chunk);
+        for await (const part of result.fullStream) {
+          if (part.type === "text-delta") {
+            const chunk = part.text ?? part.textDelta ?? "";
+            fullResponse += chunk;
+            if (onChunk) onChunk(chunk);
+          }
+        }
+
+
+
+        if (!fullResponse) {
+          try {
+            fullResponse = (await result.text) || "";
+          } catch {
+            // ignore if result.text is not available
+          }
         }
 
         const toolCalls = [];
@@ -91,6 +123,20 @@ export class AIService {
           }
         }
 
+        if (!fullResponse && toolResults.length > 0) {
+          fullResponse = toolResults
+            .map((tr) => {
+              const output = tr.output ?? tr.result;
+              const resStr =
+                typeof output === "object"
+                  ? JSON.stringify(output)
+                  : String(output);
+              return `Tool ${tr.toolName} output: ${resStr}`;
+            })
+            .join("\n");
+        }
+
+
         return {
           content: fullResponse,
           finishReason: result.finishReason,
@@ -107,36 +153,41 @@ export class AIService {
           const delaySec = Math.round(delayMs / 1000);
           console.log(
             chalk.yellow(
-              `\n⚠ Rate limit hit (429). Retrying in ${delaySec}s... (attempt ${attempt}/${MAX_RETRIES})`
+              `\n⚠ Rate limit hit (429) on ${this.getDisplayName()}. Retrying in ${delaySec}s... (attempt ${attempt}/${MAX_RETRIES})`
             )
           );
           await sleep(delayMs);
           continue;
         }
 
-        // Provide an actionable message for rate-limit errors.
+        // Provide actionable provider-specific error messages
         if (isRateLimitError(error)) {
+          const provInfo = AI_PROVIDERS[this.provider];
           console.error(
             chalk.red(
-              "\n✖ Gemini API quota exhausted. All retry attempts failed."
+              `\n✖ ${this.getDisplayName()} rate limit / quota exhausted. All retry attempts failed.`
             )
           );
           console.error(
             chalk.yellow(
-              "  Possible fixes:\n" +
-                "  1. Wait a few minutes and try again (free-tier resets per minute)\n" +
-                "  2. Check your quota: https://ai.google.dev/gemini-api/docs/rate-limits\n" +
-                "  3. Upgrade your Gemini API plan for higher limits\n" +
-                "  4. Use a different API key with available quota"
+              `  Possible fixes:\n` +
+                `  1. Wait a moment and try again\n` +
+                `  2. Check your quota & billing at: ${provInfo?.docsUrl || "provider portal"}\n` +
+                `  3. Switch to another model or update your API key: orbital set-key --provider ${this.provider} <KEY>`
             )
           );
         } else {
+          const detailedMsg =
+            error?.data?.error?.message ||
+            error?.message ||
+            error;
           console.error(
-            chalk.red("AI Service Error:"),
-            error?.message || error
+            chalk.red(`AI Service Error (${this.getDisplayName()}):`),
+            detailedMsg
           );
         }
 
+
         throw error;
       }
     }
@@ -158,11 +209,10 @@ export class AIService {
       return result.object;
     } catch (error) {
       console.log(
-        chalk.red("AI Structured Generation Error:"),
+        chalk.red(`AI Structured Generation Error (${this.getDisplayName()}):`),
         error?.message || error
       );
       throw error;
     }
   }
 }
-

package/server/src/cli/chat/chat-with-ai-agent.js

@@ -12,13 +12,11 @@ import {
 } from "../../config/agentConfig.js";
 import { apiRequestSafe } from "../utils/apiClient.js";
 import { AIService } from "../ai/googleService.js";
-import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
+import { requireApiKey, hydrateApiKeyEnv } from "../../lib/orbitalConfig.js";
+import { parseModelChoice } from "../../config/aiConfig.js";
 
-marked.use(markedTerminal());
 
-const getEnabledToolNames = () => {
-  return [];
-};
+marked.use(markedTerminal());
 
 const getUserFromToken = async () => {
   const token = await getStoredToken();
@@ -44,7 +42,12 @@ const getUserFromToken = async () => {
   }
 };
 
-const initConversation = async (userId, conversationId = null, mode = "tool") => {
+const initConversation = async (
+  userId,
+  conversationId = null,
+  mode = "agent",
+  modelDisplayName = null
+) => {
   const spinner = yoctoSpinner({ text: "Loading conversation..." }).start();
 
   const result = await apiRequestSafe("/api/cli/conversations/init", {
@@ -55,16 +58,14 @@ const initConversation = async (userId, conversationId = null, mode = "tool") =>
 
   spinner.success("Conversation Loaded");
 
-  const enabledToolNames = getEnabledToolNames();
-  const toolsDisplay =
-    enabledToolNames.length > 0
-      ? `\n${chalk.gray("Active Tools:")} ${enabledToolNames.join(", ")}`
-      : `\n${chalk.gray("No tools enabled")}`;
+  const modelLine = modelDisplayName
+    ? `\n${chalk.cyan("Model: " + modelDisplayName)}`
+    : "";
 
   const conversationInfo = boxen(
     `${chalk.bold("Conversation")}: ${conversation.title}\n${chalk.gray(
       "ID: " + conversation.id
-    )}\n${chalk.gray("Mode: " + conversation.mode)}${toolsDisplay}\n${chalk.cyan(
+    )}\n${chalk.gray("Mode: " + conversation.mode)}${modelLine}\n${chalk.cyan(
       "Working Directory: "
     )}${process.cwd()}`,
     {
@@ -88,7 +89,7 @@ const saveMessage = async (conversationId, role, content) => {
   });
 };
 
-const agentLoop = async (conversation) => {
+const agentLoop = async (conversation, modelConfig = null) => {
   const helpBox = boxen(
     `${chalk.cyan.bold("What can the agent do?")}\n\n` +
       `${chalk.gray("• Generate complete applications from descriptions")}\n` +
@@ -113,8 +114,8 @@ const agentLoop = async (conversation) => {
 
   while (true) {
     const userInput = await text({
-      message: chalk.magenta("What would you like to build?"),
-      placeholder: "Describe your application...",
+      message: chalk.magenta("Describe the application you want to build:"),
+      placeholder: "e.g., A CLI todo app with SQLite, or a React counter app",
       validate(value) {
         if (!value || value.trim().length === 0) {
           return "Description cannot be empty";
@@ -149,8 +150,8 @@ const agentLoop = async (conversation) => {
     await saveMessage(conversation.id, "user", userInput);
 
     try {
-      await requireGeminiApiKey();
-      const aiService = new AIService();
+      const aiService = new AIService(modelConfig);
+      await requireApiKey(aiService.provider);
       const application = await generateApplicationPlan(userInput, aiService);
 
       if (!application || !Array.isArray(application.files) || application.files.length === 0) {
@@ -209,7 +210,17 @@ const agentLoop = async (conversation) => {
   }
 };
 
-export const startAgentChat = async (conversationId = null) => {
+export const startAgentChat = async (modelConfigOrConvId = null, convId = null) => {
+  let modelConfig = null;
+  let conversationId = null;
+
+  if (typeof modelConfigOrConvId === "string") {
+    conversationId = modelConfigOrConvId;
+  } else if (modelConfigOrConvId && typeof modelConfigOrConvId === "object") {
+    modelConfig = modelConfigOrConvId;
+    conversationId = convId;
+  }
+
   try {
     intro(
       boxen(
@@ -223,6 +234,10 @@ export const startAgentChat = async (conversationId = null) => {
       )
     );
 
+    const { provider } = parseModelChoice(modelConfig);
+    await hydrateApiKeyEnv(provider);
+    const aiService = new AIService(modelConfig);
+
     const user = await getUserFromToken();
 
     const shouldContinue = await confirm({
@@ -237,8 +252,13 @@ export const startAgentChat = async (conversationId = null) => {
       process.exit(0);
     }
 
-    const conversation = await initConversation(user.id, conversationId);
-    await agentLoop(conversation);
+    const conversation = await initConversation(
+      user.id,
+      conversationId,
+      "agent",
+      aiService.getDisplayName()
+    );
+    await agentLoop(conversation, modelConfig);
 
     outro(chalk.green.bold("\nThanks for using Agent Mode!"));
   } catch (error) {

package/server/src/cli/chat/chat-with-ai-tools.js

@@ -17,11 +17,13 @@ import {
   enableTools,
   getEnabledTools,
   getEnabledToolNames,
+  getToolsForProvider,
   resetTools,
 } from "../../config/toolConfig.js";
 import { apiRequestSafe } from "../utils/apiClient.js";
 import { AIService } from "../ai/googleService.js";
-import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
+import { requireApiKey, hydrateApiKeyEnv } from "../../lib/orbitalConfig.js";
+import { parseModelChoice } from "../../config/aiConfig.js";
 
 marked.use(
   markedTerminal({
@@ -67,7 +69,7 @@ const getUserFromToken = async () => {
   }
 };
 
-const selectTools = async () => {
+const selectTools = async (provider = "gemini") => {
   const truncateHint = (text, maxLen = 70) => {
     if (!text) return "";
     const singleLine = String(text).replace(/\s+/g, " ").trim();
@@ -75,10 +77,19 @@ const selectTools = async () => {
     return singleLine.slice(0, Math.max(0, maxLen - 3)) + "...";
   };
 
-  const toolOptions = availableTools.map((tool) => ({
+  const providerTools = getToolsForProvider(provider);
+
+  if (providerTools.length === 0) {
+    console.log(
+      chalk.yellow(`\nNo tools available for ${provider}. AI will work without tools.\n`)
+    );
+    enableTools([]);
+    return [];
+  }
+
+  const toolOptions = providerTools.map((tool) => ({
     value: tool.id,
     label: tool.name,
-    
     hint: truncateHint(tool.description),
   }));
 
@@ -104,7 +115,7 @@ const selectTools = async () => {
       chalk.green(
         `Enabled tools:\n${selectedTools
           .map((id) => {
-            const tool = availableTools.find((t) => t.id === id);
+            const tool = providerTools.find((t) => t.id === id);
             return tool ? ` • ${tool.name}` : ` • ${id}`;
           })
           .join("\n")}`
@@ -124,7 +135,12 @@ const selectTools = async () => {
   return selectedTools;
 };
 
-const initConversation = async (userId, conversationId = null, mode = "tool") => {
+const initConversation = async (
+  userId,
+  conversationId = null,
+  mode = "tool",
+  modelDisplayName = null
+) => {
   const spinner = yoctoSpinner({ text: "Loading conversation..." }).start();
   const result = await apiRequestSafe("/api/cli/conversations/init", {
     method: "POST",
@@ -142,10 +158,14 @@ const initConversation = async (userId, conversationId = null, mode = "tool") =>
       ? `\n${chalk.gray("Active Tools:")} ${enabledToolNames.join(", ")}`
       : `\n${chalk.gray("No tools enabled")}`;
 
+  const modelLine = modelDisplayName
+    ? `\n${chalk.cyan("Model: " + modelDisplayName)}`
+    : "";
+
   const conversationInfo = boxen(
     `${chalk.bold("Conversation")}: ${conversation.title}\n${chalk.gray(
       "ID: " + conversation.id
-    )}\n${chalk.gray("Mode: " + conversation.mode)}${toolsDisplay}`,
+    )}\n${chalk.gray("Mode: " + conversation.mode)}${modelLine}${toolsDisplay}`,
     {
       padding: 1,
       margin: { top: 1, bottom: 1 },
@@ -210,8 +230,22 @@ const saveMessage = async (conversationId, role, content) => {
   });
 };
 
-const getAIResponse = async (conversationId, toolIds = []) => {
-  const spinner = yoctoSpinner({ text: "AI is thinking..." }).start();
+const getAIResponse = async (conversationId, toolIds = [], modelConfig = null) => {
+  const aiService = new AIService(modelConfig);
+  await requireApiKey(aiService.provider);
+
+  // Ensure tool state matches what the user selected
+  resetTools();
+  if (Array.isArray(toolIds)) enableTools(toolIds);
+
+  const tools = getEnabledTools(aiService.provider);
+  const enabledNames = getEnabledToolNames();
+  const toolBadge =
+    enabledNames.length > 0 ? chalk.dim(` [Tools: ${enabledNames.join(", ")}]`) : "";
+
+  const spinner = yoctoSpinner({
+    text: `${aiService.getDisplayName()} is thinking...${toolBadge}`,
+  }).start();
   let fullResponse = "";
   const toolCallsDetected = [];
 
@@ -224,20 +258,16 @@ const getAIResponse = async (conversationId, toolIds = []) => {
     const messages = Array.isArray(messageResult?.messages) ? messageResult.messages : [];
     const aiMessages = messages.map((m) => ({ role: m.role, content: m.content }));
 
-    // Ensure the API key is present in env before any tools are initialized.
-    await requireGeminiApiKey();
-
-    // Ensure tool state matches what the user selected.
-    resetTools();
-    if (Array.isArray(toolIds)) enableTools(toolIds);
-
-    const tools = getEnabledTools();
-    const aiService = new AIService();
     const result = await aiService.sendMessage(aiMessages, null, tools);
 
     spinner.stop();
     console.log("\n");
-    console.log(chalk.green.bold("Assistant: "));
+    const toolsHeader =
+      enabledNames.length > 0 ? chalk.dim(` • Tools: ${enabledNames.join(", ")}`) : "";
+    console.log(
+      chalk.green.bold(`Assistant (${aiService.getDisplayName()}):`) +
+        (toolsHeader ? ` ${toolsHeader}` : "")
+    );
     console.log(chalk.gray("-".repeat(60)));
 
     fullResponse = result?.content || "";
@@ -270,12 +300,20 @@ const getAIResponse = async (conversationId, toolIds = []) => {
     if (result?.toolResults && result.toolResults.length > 0) {
       const toolResultBox = boxen(
         result.toolResults
-          .map(
-            (tr) =>
-              `${chalk.green("✓ Tool:")} ${tr.toolName}\n${chalk.gray(
-                "Result:"
-              )} ${String(JSON.stringify(tr.result, null, 2)).slice(0, 200)}...`
-          )
+          .map((tr) => {
+            const output = tr.output ?? tr.result;
+            const resStr =
+              output === undefined
+                ? "Completed"
+                : typeof output === "object"
+                ? JSON.stringify(output, null, 2)
+                : String(output);
+            const truncated =
+              resStr.length > 200 ? `${resStr.slice(0, 200)}...` : resStr;
+            return `${chalk.green("✓ Tool:")} ${tr.toolName}\n${chalk.gray(
+              "Result:"
+            )} ${truncated}`;
+          })
           .join("\n\n"),
         {
           padding: 1,
@@ -300,7 +338,7 @@ const getAIResponse = async (conversationId, toolIds = []) => {
   }
 };
 
-const chatLoop = async (conversation, selectedToolIds = []) => {
+const chatLoop = async (conversation, selectedToolIds = [], modelConfig = null) => {
   const enabledToolNames = getEnabledToolNames();
 
   const helpText = [
@@ -308,28 +346,29 @@ const chatLoop = async (conversation, selectedToolIds = []) => {
     `• AI has access to: ${
       enabledToolNames.length > 0 ? enabledToolNames.join(", ") : "No tools"
     }`,
+    "• Tools are invoked automatically by AI when needed",
+    "• Markdown formatting is supported",
     '• Type "exit" to end conversation',
     "• Press Ctrl+C to quit anytime",
-  ]
-    .map((line) => chalk.gray(line))
-    .join("\n");
-
-  console.log(
-    boxen(helpText, {
-      padding: 1,
-      margin: { bottom: 1 },
-      borderStyle: "round",
-      borderColor: "gray",
-      dimBorder: true,
-    })
-  );
+  ].join("\n");
+
+  const helpBox = boxen(chalk.gray(helpText), {
+    padding: 1,
+    margin: { bottom: 1 },
+    borderStyle: "round",
+    borderColor: "gray",
+    dimBorder: true,
+  });
+  console.log(helpBox);
 
   while (true) {
     const userInput = await text({
       message: chalk.blue("Your message"),
-      placeholder: "Type your message...",
+      placeholder: "Ask something that requires tools...",
       validate(value) {
-        if (!value || value.trim().length === 0) return "Message cannot be empty";
+        if (!value || value.trim().length === 0) {
+          return "Message cannot be empty";
+        }
       },
     });
 
@@ -374,7 +413,11 @@ const chatLoop = async (conversation, selectedToolIds = []) => {
       { method: "GET" }
     );
 
-    const aiResponse = await getAIResponse(conversation.id, selectedToolIds);
+    const aiResponse = await getAIResponse(
+      conversation.id,
+      selectedToolIds,
+      modelConfig
+    );
     await saveMessage(conversation.id, "assistant", aiResponse);
 
     await updateConversationTitle(
@@ -385,7 +428,17 @@ const chatLoop = async (conversation, selectedToolIds = []) => {
   }
 };
 
-export const startToolChat = async (conversationId) => {
+export const startToolChat = async (modelConfigOrConvId = null, convId = null) => {
+  let modelConfig = null;
+  let conversationId = null;
+
+  if (typeof modelConfigOrConvId === "string") {
+    conversationId = modelConfigOrConvId;
+  } else if (modelConfigOrConvId && typeof modelConfigOrConvId === "object") {
+    modelConfig = modelConfigOrConvId;
+    conversationId = convId;
+  }
+
   try {
     intro(
       boxen(chalk.bold.cyan("Orbital AI - Tool Calling Mode"), {
@@ -395,13 +448,22 @@ export const startToolChat = async (conversationId) => {
       })
     );
 
+    const { provider } = parseModelChoice(modelConfig);
+    await hydrateApiKeyEnv(provider);
+    const aiService = new AIService(modelConfig);
+
     const user = await getUserFromToken();
 
-    const selectedToolIds = await selectTools();
+    const selectedToolIds = await selectTools(aiService.provider);
 
-    const conversation = await initConversation(user.id, conversationId, "tool");
+    const conversation = await initConversation(
+      user.id,
+      conversationId,
+      "tool",
+      aiService.getDisplayName()
+    );
 
-    await chatLoop(conversation, selectedToolIds);
+    await chatLoop(conversation, selectedToolIds, modelConfig);
 
     resetTools();
     outro(chalk.green("Thanks for using tools"));