@dubeyvishal/orbital-cli 1.6.14 → 1.6.16

package/README.md

@@ -25,13 +25,13 @@ Start Orbital:
 ## 📸 Project Screenshots
 
 ### 🔐 Orbital Login Screen
-![Orbital Login Screen](https://res.cloudinary.com/damw21f39/image/upload/v1773569580/pic1_u0wu0y.png)
+![Orbital Login Screen](https://ik.imagekit.io/55z5toj5e/Orbital-CLI/orbital_login.png?updatedAt=1788983014376)
 
 ### 🛠️ Orbital Wakeup – Tools Loaded
-![Orbital Wakeup](https://res.cloudinary.com/damw21f39/image/upload/v1773569581/pic2_mvnpiu.png)
+![Orbital Wakeup](https://ik.imagekit.io/55z5toj5e/Orbital-CLI/orbital_wakeup.png?updatedAt=1788982937600)
 
 ### 🤖 Agentic Mode
-![Agentic Mode](https://res.cloudinary.com/damw21f39/image/upload/v1773569581/pic3_bvidmp.png)
+![Agentic Mode](https://ik.imagekit.io/55z5toj5e/Orbital-CLI/agentic_mode.png?updatedAt=1788982970736)
 
 ------------------------------------------------------------------------
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubeyvishal/orbital-cli",
-  "version": "1.6.14",
+  "version": "1.6.16",
   "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,8 +21,6 @@
   },
   "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",
@@ -51,4 +49,4 @@
     "client-server",
     "javascript"
   ]
-}
+}

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

@@ -1,19 +1,11 @@
+import { google } from "@ai-sdk/google";
 import { streamText, generateObject } from "ai";
 import { config } from "../../config/googleConfig.js";
 import chalk from "chalk";
-import {
-  normalizeProviderName,
-  getSelectedModelSync,
-} from "../../lib/orbitalConfig.js";
-import {
-  AI_PROVIDERS,
-  createModelInstance,
-  getModelDisplayName,
-  parseModelChoice,
-} from "../../config/aiConfig.js";
+import { requireGeminiApiKeySync } from "../../lib/orbitalConfig.js";
 
 const MAX_RETRIES = 3;
-const BASE_DELAY_MS = 3000; // 3 seconds
+const BASE_DELAY_MS = 5000; // 5 seconds
 
 const isRateLimitError = (error) => {
   if (!error) return false;
@@ -31,30 +23,12 @@ const isRateLimitError = (error) => {
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 export class AIService {
-  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 };
+  constructor() {
+    const apiKey = requireGeminiApiKeySync();
 
-    }
-
-    this.provider = resolved.provider;
-    this.modelName = resolved.model;
-    this.model = createModelInstance(this.provider, this.modelName);
-  }
-
-  getDisplayName() {
-    return getModelDisplayName(this.provider, this.modelName);
+    this.model = google(config.model, {
+      apiKey,
+    });
   }
 
   async sendMessage(messages, onChunk, tools = undefined, onToolCall = null) {
@@ -71,28 +45,22 @@ 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 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
-          }
+        for await (const chunk of result.textStream) {
+          fullResponse += chunk;
+          if (onChunk) onChunk(chunk);
         }
 
         const toolCalls = [];
@@ -123,20 +91,6 @@ 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,
@@ -153,41 +107,36 @@ export class AIService {
           const delaySec = Math.round(delayMs / 1000);
           console.log(
             chalk.yellow(
-              `\n⚠ Rate limit hit (429) on ${this.getDisplayName()}. Retrying in ${delaySec}s... (attempt ${attempt}/${MAX_RETRIES})`
+              `\n⚠ Rate limit hit (429). Retrying in ${delaySec}s... (attempt ${attempt}/${MAX_RETRIES})`
             )
           );
           await sleep(delayMs);
           continue;
         }
 
-        // Provide actionable provider-specific error messages
+        // Provide an actionable message for rate-limit errors.
         if (isRateLimitError(error)) {
-          const provInfo = AI_PROVIDERS[this.provider];
           console.error(
             chalk.red(
-              `\n✖ ${this.getDisplayName()} rate limit / quota exhausted. All retry attempts failed.`
+              "\n✖ Gemini API quota exhausted. All retry attempts failed."
             )
           );
           console.error(
             chalk.yellow(
-              `  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>`
+              "  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"
             )
           );
         } else {
-          const detailedMsg =
-            error?.data?.error?.message ||
-            error?.message ||
-            error;
           console.error(
-            chalk.red(`AI Service Error (${this.getDisplayName()}):`),
-            detailedMsg
+            chalk.red("AI Service Error:"),
+            error?.message || error
           );
         }
 
-
         throw error;
       }
     }
@@ -209,10 +158,11 @@ export class AIService {
       return result.object;
     } catch (error) {
       console.log(
-        chalk.red(`AI Structured Generation Error (${this.getDisplayName()}):`),
+        chalk.red("AI Structured Generation Error:"),
         error?.message || error
       );
       throw error;
     }
   }
 }
+

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

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

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

@@ -17,13 +17,11 @@ import {
   enableTools,
   getEnabledTools,
   getEnabledToolNames,
-  getToolsForProvider,
   resetTools,
 } from "../../config/toolConfig.js";
 import { apiRequestSafe } from "../utils/apiClient.js";
 import { AIService } from "../ai/googleService.js";
-import { requireApiKey, hydrateApiKeyEnv } from "../../lib/orbitalConfig.js";
-import { parseModelChoice } from "../../config/aiConfig.js";
+import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
 
 marked.use(
   markedTerminal({
@@ -69,7 +67,7 @@ const getUserFromToken = async () => {
   }
 };
 
-const selectTools = async (provider = "gemini") => {
+const selectTools = async () => {
   const truncateHint = (text, maxLen = 70) => {
     if (!text) return "";
     const singleLine = String(text).replace(/\s+/g, " ").trim();
@@ -77,19 +75,10 @@ const selectTools = async (provider = "gemini") => {
     return singleLine.slice(0, Math.max(0, maxLen - 3)) + "...";
   };
 
-  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) => ({
+  const toolOptions = availableTools.map((tool) => ({
     value: tool.id,
     label: tool.name,
+    
     hint: truncateHint(tool.description),
   }));
 
@@ -115,7 +104,7 @@ const selectTools = async (provider = "gemini") => {
       chalk.green(
         `Enabled tools:\n${selectedTools
           .map((id) => {
-            const tool = providerTools.find((t) => t.id === id);
+            const tool = availableTools.find((t) => t.id === id);
             return tool ? ` • ${tool.name}` : ` • ${id}`;
           })
           .join("\n")}`
@@ -135,12 +124,7 @@ const selectTools = async (provider = "gemini") => {
   return selectedTools;
 };
 
-const initConversation = async (
-  userId,
-  conversationId = null,
-  mode = "tool",
-  modelDisplayName = null
-) => {
+const initConversation = async (userId, conversationId = null, mode = "tool") => {
   const spinner = yoctoSpinner({ text: "Loading conversation..." }).start();
   const result = await apiRequestSafe("/api/cli/conversations/init", {
     method: "POST",
@@ -158,14 +142,10 @@ const initConversation = async (
       ? `\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)}${modelLine}${toolsDisplay}`,
+    )}\n${chalk.gray("Mode: " + conversation.mode)}${toolsDisplay}`,
     {
       padding: 1,
       margin: { top: 1, bottom: 1 },
@@ -230,22 +210,8 @@ const saveMessage = async (conversationId, role, content) => {
   });
 };
 
-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();
+const getAIResponse = async (conversationId, toolIds = []) => {
+  const spinner = yoctoSpinner({ text: "AI is thinking..." }).start();
   let fullResponse = "";
   const toolCallsDetected = [];
 
@@ -258,16 +224,20 @@ const getAIResponse = async (conversationId, toolIds = [], modelConfig = null) =
     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");
-    const toolsHeader =
-      enabledNames.length > 0 ? chalk.dim(` • Tools: ${enabledNames.join(", ")}`) : "";
-    console.log(
-      chalk.green.bold(`Assistant (${aiService.getDisplayName()}):`) +
-        (toolsHeader ? ` ${toolsHeader}` : "")
-    );
+    console.log(chalk.green.bold("Assistant: "));
     console.log(chalk.gray("-".repeat(60)));
 
     fullResponse = result?.content || "";
@@ -300,20 +270,12 @@ const getAIResponse = async (conversationId, toolIds = [], modelConfig = null) =
     if (result?.toolResults && result.toolResults.length > 0) {
       const toolResultBox = boxen(
         result.toolResults
-          .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}`;
-          })
+          .map(
+            (tr) =>
+              `${chalk.green("✓ Tool:")} ${tr.toolName}\n${chalk.gray(
+                "Result:"
+              )} ${String(JSON.stringify(tr.result, null, 2)).slice(0, 200)}...`
+          )
           .join("\n\n"),
         {
           padding: 1,
@@ -338,7 +300,7 @@ const getAIResponse = async (conversationId, toolIds = [], modelConfig = null) =
   }
 };
 
-const chatLoop = async (conversation, selectedToolIds = [], modelConfig = null) => {
+const chatLoop = async (conversation, selectedToolIds = []) => {
   const enabledToolNames = getEnabledToolNames();
 
   const helpText = [
@@ -346,29 +308,28 @@ const chatLoop = async (conversation, selectedToolIds = [], modelConfig = null)
     `• 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",
-  ].join("\n");
-
-  const helpBox = boxen(chalk.gray(helpText), {
-    padding: 1,
-    margin: { bottom: 1 },
-    borderStyle: "round",
-    borderColor: "gray",
-    dimBorder: true,
-  });
-  console.log(helpBox);
+  ]
+    .map((line) => chalk.gray(line))
+    .join("\n");
+
+  console.log(
+    boxen(helpText, {
+      padding: 1,
+      margin: { bottom: 1 },
+      borderStyle: "round",
+      borderColor: "gray",
+      dimBorder: true,
+    })
+  );
 
   while (true) {
     const userInput = await text({
       message: chalk.blue("Your message"),
-      placeholder: "Ask something that requires tools...",
+      placeholder: "Type your message...",
       validate(value) {
-        if (!value || value.trim().length === 0) {
-          return "Message cannot be empty";
-        }
+        if (!value || value.trim().length === 0) return "Message cannot be empty";
       },
     });
 
@@ -413,11 +374,7 @@ const chatLoop = async (conversation, selectedToolIds = [], modelConfig = null)
       { method: "GET" }
     );
 
-    const aiResponse = await getAIResponse(
-      conversation.id,
-      selectedToolIds,
-      modelConfig
-    );
+    const aiResponse = await getAIResponse(conversation.id, selectedToolIds);
     await saveMessage(conversation.id, "assistant", aiResponse);
 
     await updateConversationTitle(
@@ -428,17 +385,7 @@ const chatLoop = async (conversation, selectedToolIds = [], modelConfig = null)
   }
 };
 
-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;
-  }
-
+export const startToolChat = async (conversationId) => {
   try {
     intro(
       boxen(chalk.bold.cyan("Orbital AI - Tool Calling Mode"), {
@@ -448,22 +395,13 @@ export const startToolChat = async (modelConfigOrConvId = null, convId = null) =
       })
     );
 
-    const { provider } = parseModelChoice(modelConfig);
-    await hydrateApiKeyEnv(provider);
-    const aiService = new AIService(modelConfig);
-
     const user = await getUserFromToken();
 
-    const selectedToolIds = await selectTools(aiService.provider);
+    const selectedToolIds = await selectTools();
 
-    const conversation = await initConversation(
-      user.id,
-      conversationId,
-      "tool",
-      aiService.getDisplayName()
-    );
+    const conversation = await initConversation(user.id, conversationId, "tool");
 
-    await chatLoop(conversation, selectedToolIds, modelConfig);
+    await chatLoop(conversation, selectedToolIds);
 
     resetTools();
     outro(chalk.green("Thanks for using tools"));