@dubeyvishal/orbital-cli 1.6.14 → 1.6.16

package/server/src/cli/commands/ai/wakeUp.js

@@ -1,145 +1,84 @@
 import chalk from "chalk";
-import { Command } from "commander";
-import yoctoSpinner from "yocto-spinner";
-import { getStoredToken } from "../../../lib/token.js";
-import { select, password, isCancel, cancel } from "@clack/prompts";
-import { startChat } from "../../../cli/chat/chat-with-ai.js";
-import { startToolChat } from "../../../cli/chat/chat-with-ai-tools.js";
-import { startAgentChat } from "../../../cli/chat/chat-with-ai-agent.js";
+import {Command} from "commander";
+import yoctoSpinner  from "yocto-spinner";
+import {getStoredToken} from "../../../lib/token.js"
+import {select} from "@clack/prompts";
+import {startChat} from "../../../cli/chat/chat-with-ai.js";
+import {startToolChat} from "../../../cli/chat/chat-with-ai-tools.js";
+import {startAgentChat} from "../../../cli/chat/chat-with-ai-agent.js";
 import { apiRequestSafe } from "../../utils/apiClient.js";
-import {
-  getApiKey,
-  setApiKey,
-  getSelectedModel,
-  saveSelectedModel,
-} from "../../../lib/orbitalConfig.js";
-import {
-  AI_PROVIDERS,
-  getModelSelectOptions,
-  parseModelChoice,
-  getModelDisplayName,
-} from "../../../config/aiConfig.js";
+import { requireGeminiApiKey } from "../../../lib/orbitalConfig.js";
 
-const wakeUpAction = async () => {
-  const token = await getStoredToken();
-  if (!token?.access_token) {
-    console.log(chalk.red("Not Authenticated. Please run 'orbital login' first."));
-    return;
-  }
 
-  const spinner = yoctoSpinner({ text: "Fetching user information..." });
-  spinner.start();
-
-  let user;
-  try {
-    const result = await apiRequestSafe("/api/cli/me");
-    user = result?.user;
-  } finally {
-    spinner.stop();
-  }
-
-  if (!user) {
-    console.log(chalk.red("User not found. Please log in again with 'orbital login'."));
-    return;
-  }
-
-  console.log(chalk.green(`Welcome back, ${user.name}! \n`));
-
-  // 1. Ask user to select the AI model FIRST
-  const savedModel = await getSelectedModel();
-  const modelOptions = getModelSelectOptions();
-  const defaultModelValue = `${savedModel.provider}:${savedModel.model}`;
-
-  const selectedModelChoice = await select({
-    message: "Select an AI Model:",
-    options: modelOptions,
-    initialValue: modelOptions.some((o) => o.value === defaultModelValue)
-      ? defaultModelValue
-      : undefined,
-  });
-
-  if (isCancel(selectedModelChoice)) {
-    cancel("Model selection cancelled.");
-    return;
-  }
-
-  const { provider, model } = parseModelChoice(selectedModelChoice);
-  await saveSelectedModel({ provider, model });
-
-  // 2. Ensure API key is configured for the chosen model/provider
-  let apiKey = await getApiKey(provider);
-  if (!apiKey) {
-    const provInfo = AI_PROVIDERS[provider];
-    console.log(
-      chalk.yellow(
-        `\n${provInfo?.name || provider} API key is required. (Obtain one at: ${provInfo?.docsUrl || "provider portal"})`
-      )
-    );
-
-    const enteredKey = await password({
-      message: `Enter your ${provInfo?.name || provider} API key:`,
-      validate(value) {
-        if (!value || !value.trim()) return "API key cannot be empty";
-      },
-    });
-
-    if (isCancel(enteredKey)) {
-      cancel("Operation cancelled.");
-      return;
+const wakeUpAction = async()=>{
+    try {
+        await requireGeminiApiKey();
+    } catch {
+        console.log(chalk.red("Gemini API key not set. Run: orbital set-key <API_KEY>"));
+        return;
     }
 
-    await setApiKey(provider, enteredKey);
-    console.log(chalk.green(`✔ ${provInfo?.name || provider} API key saved securely.\n`));
-  }
-
-  console.log(
-    chalk.cyan(`Active AI Model: ${chalk.bold(getModelDisplayName(provider, model))}\n`)
-  );
-
-  // 3. Mode selection
-  const choice = await select({
-    message: "Select an Option",
-    options: [
-      {
-        value: "chat",
-        label: "Chat",
-        hint: "Simple chat with AI",
-      },
-      {
-        value: "tool",
-        label: "Tool Calling",
-        hint: "Chat with tools and code execution",
-      },
-      {
-        value: "agent",
-        label: "Agentic Mode",
-        hint: "Fullstack application generation agent",
-      },
-    ],
-  });
-
-  if (isCancel(choice)) {
-    cancel("Operation cancelled.");
-    return;
-  }
-
-  const modelConfig = { provider, model };
-
-  switch (choice) {
-    case "chat":
-      await startChat("chat", null, modelConfig);
-      break;
-    case "tool":
-      await startToolChat(modelConfig);
-      break;
-    case "agent":
-      await startAgentChat(modelConfig);
-      break;
-  }
-};
-
-export const wakeUp = new Command("wakeup")
-  .description("Wake up the AI")
-  .alias("wake-up")
-  .alias("wakup")
-  .action(wakeUpAction);
+    const token = await getStoredToken();
+     if(!token?.access_token){
+        console.log(chalk.red("Not Authenticated. please login"))
+        return ;
+     }
+
+     const spinner = yoctoSpinner({text: "Fetching user information ..."})
+     spinner.start()
+
+     let user;
+     try{
+        const result = await apiRequestSafe("/api/cli/me");
+        user = result?.user;
+     }
+     finally{
+        spinner.stop();
+     }
+
+     if(!user){
+        console.log(chalk.red("User not found."))
+        return ;
+     }
+
+     console.log(chalk.green(`Welcome back, ${user.name}! \n`));
+
+     const choice = await select({
+        message : "Select an Option",
+        options : [
+            {
+                value : "chat",
+                label: "Chat",
+                hint : "Simple chat with AI"
+            },
+            {
+                value : "tool",
+                label: "Tool Calling",
+                hint : "Chat with tools (Google Search , Code Execution"
+            },
+            {
+                value : "agent",
+                label: "Agentic Mode",
+                hint : "Advanced AI Agent"
+            },
+        ]
+     });
+
+     switch(choice){
+        case "chat":
+            await startChat("chat");
+            break ;
+        case "tool":
+            await startToolChat();
+            break ;
+        case "agent":
+            await startAgentChat();
+            break ;
+     }
+}
+
+export const wakeUp = new Command("wakeup").
+description("Wake up the AI").
+alias("wake-up").
+alias("wakup").
+action(wakeUpAction)

package/server/src/cli/commands/auth/login.js

@@ -11,6 +11,7 @@ import { fileURLToPath } from "url";
 import { getStoredToken, isTokenExpired, storeToken ,TOKEN_FILE } from "../../../lib/token.js";
 import { API_BASE } from "../../../config/api.js";
 import { apiRequestSafe } from "../../utils/apiClient.js";
+import { requireGeminiApiKey } from "../../../lib/orbitalConfig.js";
 
 
 const __filename = fileURLToPath(import.meta.url);
@@ -92,7 +93,12 @@ const resolveClientId = async (cliClientId) => {
 
 
 export const loginAction = async (cmdOptions) => {
-
+  try {
+    await requireGeminiApiKey();
+  } catch {
+    console.log(chalk.red("Gemini API key not set. Run: orbital set-key <API_KEY>"));
+    process.exit(1);
+  }
 
   const schema = z.object({
     serverUrl: z.string().optional(),

package/server/src/cli/commands/config/setkey.js

@@ -1,58 +1,12 @@
 import { Command } from "commander";
 import chalk from "chalk";
-import { select, password, isCancel, cancel } from "@clack/prompts";
-import { setApiKey, normalizeProviderName } from "../../../lib/orbitalConfig.js";
+import { setGeminiApiKey } from "../../../lib/orbitalConfig.js";
 import { getCredentialServiceName } from "../../../lib/credentialStore.js";
-import { AI_PROVIDERS } from "../../../config/aiConfig.js";
 
-const setKeyAction = async (apiKeyArg, cmdOptions) => {
+const setKeyAction = async (apiKey) => {
   try {
-    let provider = cmdOptions.provider;
-    let apiKey = apiKeyArg;
-
-    // Interactive mode if key was not supplied via command line argument
-    if (!apiKey) {
-      if (!provider) {
-        const provChoice = await select({
-          message: "Select AI Provider to configure API key for:",
-          options: [
-            { value: "gemini", label: "Google Gemini", hint: "AI Studio API key" },
-            { value: "openai", label: "OpenAI", hint: "platform.openai.com key" },
-            { value: "grok", label: "Grok (xAI)", hint: "console.x.ai key" },
-          ],
-        });
-
-        if (isCancel(provChoice)) {
-          cancel("Operation cancelled.");
-          return;
-        }
-        provider = provChoice;
-      }
-
-      const provInfo = AI_PROVIDERS[normalizeProviderName(provider)];
-      const enteredKey = await password({
-        message: `Enter your ${provInfo?.name || provider} API key:`,
-        validate(value) {
-          if (!value || !value.trim()) return "API key cannot be empty";
-        },
-      });
-
-      if (isCancel(enteredKey)) {
-        cancel("Operation cancelled.");
-        return;
-      }
-
-      apiKey = enteredKey;
-    }
-
-    const norm = normalizeProviderName(provider || "gemini");
-    const provInfo = AI_PROVIDERS[norm];
-
-    await setApiKey(norm, apiKey);
-
-    console.log(
-      chalk.green(`\n✔ ${provInfo?.name || norm} API key saved successfully.`)
-    );
+    await setGeminiApiKey(apiKey);
+    console.log(chalk.green("Gemini API key saved."));
     console.log(
       chalk.gray(
         `Stored securely in your OS credential manager (service: ${getCredentialServiceName()}).`
@@ -65,13 +19,8 @@ const setKeyAction = async (apiKeyArg, cmdOptions) => {
 };
 
 export const setkey = new Command("set-key")
-  .description("Store your AI provider API key securely in keytar (Gemini, OpenAI, Grok)")
-  .argument("[API_KEY]", "Your AI provider API key")
-  .option(
-    "-p, --provider <provider>",
-    "AI provider: gemini (default), openai, or grok",
-    "gemini"
-  )
+  .description("Store your Gemini API key securely (keytar)")
+  .argument("<API_KEY>", "Your Gemini API key")
   .alias("set")
   .alias("setkey")
   .action(setKeyAction);

package/server/src/cli/main.js

@@ -13,10 +13,10 @@ import {launch} from "./commands/General/openApp.js"
 import {search} from "./commands/General/searchYoutube.js"
 import {play} from "./commands/General/playSong.js"
 import { createRequire } from "module";
+
 const require = createRequire(import.meta.url);
 const packageJson = require("../../../package.json");
 
-
 const main = async()=>{
 
     console.log(

package/server/src/config/googleConfig.js

@@ -2,5 +2,5 @@ import "./env.js";
 
 export const config = {
     googleApiKey : process.env.GOOGLE_GENERATIVE_AI_API_KEY || "",
-    model : process.env.ORBITAL_MODEL || "gemini-2.5-flash"
+    model : process.env.ORBITAL_MODEL || "gemini-3.5-flash-lite"
 }

package/server/src/config/toolConfig.js

@@ -1,19 +1,13 @@
 import { google } from "@ai-sdk/google";
 import chalk from "chalk";
-import {
-  normalizeProviderName,
-  requireApiKeySync,
-  hasApiKeySync,
-} from "../lib/orbitalConfig.js";
+import { requireGeminiApiKeySync } from "../lib/orbitalConfig.js";
 
 export const availableTools = [
-  // Google Gemini Native Tools
   {
     id: "google_search",
     name: "Google Search",
     description:
       "Access the latest information using Google Search. Useful for current events, news, and real-time information",
-    provider: "gemini",
     getTool: () => google.tools.googleSearch({}),
     enabled: false,
   },
@@ -22,7 +16,6 @@ export const availableTools = [
     name: "Code Execution",
     description:
       "Generate and execute Python code to perform calculations, solve problems or provide accurate information",
-    provider: "gemini",
     getTool: () => google.tools.codeExecution({}),
     enabled: false,
   },
@@ -31,41 +24,45 @@ export const availableTools = [
     name: "URL Context",
     description:
       "Provide specific URLs that you want the model to analyse directly from the prompt. Supports up to 20 URLs per request.",
-    provider: "gemini",
     getTool: () => google.tools.urlContext({}),
     enabled: false,
   },
 ];
 
-export const getToolsForProvider = (provider = "gemini") => {
-  const norm = normalizeProviderName(provider);
-  return availableTools.filter(
-    (tool) => tool.provider === "all" || tool.provider === norm
-  );
-};
-
-export const getEnabledTools = (provider = "gemini") => {
-  const norm = normalizeProviderName(provider);
+export const getEnabledTools = () => {
   const tools = {};
 
   try {
-    const providerTools = getToolsForProvider(norm);
+    const enabledToolCount = availableTools.filter((t) => t.enabled).length;
+    if (enabledToolCount > 0 && !process.env.GOOGLE_GENERATIVE_AI_API_KEY) {
+      
+      requireGeminiApiKeySync();
+    }
 
-    for (const toolConfig of providerTools) {
+    for (const toolConfig of availableTools) {
       if (toolConfig.enabled) {
-        if (toolConfig.provider === "gemini" && !hasApiKeySync("gemini")) {
-          requireApiKeySync("gemini");
-        }
         tools[toolConfig.id] = toolConfig.getTool();
       }
     }
 
+    if (Object.keys(tools).length > 0) {
+      console.log(
+        chalk.gray(`[DEBUG] Enabled tools: ${Object.keys(tools).join(", ")}`)
+      );
+    } else {
+      console.log(chalk.yellow(`[DEBUG] No tools enabled`));
+    }
+
     return Object.keys(tools).length > 0 ? tools : undefined;
   } catch (error) {
     console.error(
       chalk.red(`[ERROR] Failed to initialize tools:`),
       error?.message || error
     );
+    console.error(
+      chalk.yellow(`Make sure you have @ai-sdk/google version 2.0+ installed`)
+    );
+    console.error(chalk.yellow(`Run: npm install @ai-sdk/google@latest`));
     return undefined;
   }
 };
@@ -75,27 +72,49 @@ export const toggleTool = (toolId) => {
 
   if (tool) {
     tool.enabled = !tool.enabled;
+    console.log(
+      chalk.gray(`[DEBUG] Tool ${toolId} toggled to ${tool.enabled}`)
+    );
     return tool.enabled;
   }
 
+  console.log(chalk.red(`[DEBUG] Tool ${toolId} not found`));
   return false;
 };
 
 export const toogleTool = toggleTool;
 
 export const enableTools = (toolIds = []) => {
+  console.log(chalk.gray(`[DEBUG] enableTools called with:`), toolIds);
+
   availableTools.forEach((tool) => {
+    const wasEnabled = tool.enabled;
     tool.enabled = toolIds.includes(tool.id);
+
+    if (tool.enabled !== wasEnabled) {
+      console.log(
+        chalk.gray(`[DEBUG] ${tool.id}: ${wasEnabled} -> ${tool.enabled}`)
+      );
+    }
   });
+
+  const enabledCount = availableTools.filter((t) => t.enabled).length;
+  console.log(
+    chalk.gray(
+      `[DEBUG] Total tools enabled: ${enabledCount} / ${availableTools.length}`
+    )
+  );
 };
 
 export const getEnabledToolNames = () => {
-  return availableTools.filter((t) => t.enabled).map((t) => t.name);
+  const names = availableTools.filter((t) => t.enabled).map((t) => t.name);
+  console.log(chalk.gray(`[DEBUG] getEnabledToolNames returning:`), names);
+  return names;
 };
 
 export const resetTools = () => {
   availableTools.forEach((tool) => {
     tool.enabled = false;
   });
+  console.log(chalk.gray(`[DEBUG] All tools have been reset (disabled)`));
 };
-

package/server/src/controllers/aiController.js

@@ -7,7 +7,7 @@ const chatService = new ChatService();
 
 export const respond = async (req, res, next) => {
   try {
-    const { conversationId, mode, toolIds, provider, model } = req.body || {};
+    const { conversationId, mode, toolIds } = req.body || {};
 
     if (!conversationId) {
       return res.status(400).json({ error: "conversationId is required" });
@@ -16,18 +16,16 @@ export const respond = async (req, res, next) => {
     const messages = await chatService.getMessages(conversationId);
     const aiMessages = chatService.formatMessageForAI(messages);
 
-    const modelConfig = provider || model ? { provider, model } : null;
-    const aiService = getAIService(modelConfig);
-
     let tools;
     if (mode === "tool") {
       resetTools();
       if (Array.isArray(toolIds)) {
         enableTools(toolIds);
       }
-      tools = getEnabledTools(aiService.provider);
+      tools = getEnabledTools();
     }
 
+    const aiService = getAIService();
     const result = await aiService.sendMessage(aiMessages, null, tools);
 
     await chatService.addMessage(conversationId, "assistant", result.content);
@@ -36,7 +34,6 @@ export const respond = async (req, res, next) => {
       content: result.content,
       toolCalls: result.toolCalls || [],
       toolResults: result.toolResults || [],
-      model: aiService.getDisplayName(),
     });
   } catch (error) {
     return next(error);
@@ -45,17 +42,16 @@ export const respond = async (req, res, next) => {
 
 export const generateAgentPlan = async (req, res, next) => {
   try {
-    const { description, provider, model } = req.body || {};
+    const { description } = req.body || {};
 
     if (!description || typeof description !== "string") {
       return res.status(400).json({ error: "description is required" });
     }
 
-    const modelConfig = provider || model ? { provider, model } : null;
-    const aiService = getAIService(modelConfig);
+    const aiService = getAIService();
     const application = await generateApplicationPlan(description, aiService);
 
-    return res.json({ application, model: aiService.getDisplayName() });
+    return res.json({ application });
   } catch (error) {
     return next(error);
   }

package/server/src/lib/credentialStore.js

@@ -16,65 +16,32 @@ const loadKeytar = async () => {
 };
 
 export const getCredentialServiceName = () => ORBITAL_KEYTAR_SERVICE;
-export const getApiKeyAccountName = (provider = "gemini") => {
-  const p = (provider || "gemini").toLowerCase().trim();
-  if (p === "google" || p === "gemini") return "api-key-gemini";
-  if (p === "openai") return "api-key-openai";
-  if (p === "xai" || p === "grok") return "api-key-grok";
-  return `api-key-${p}`;
-};
+export const getApiKeyAccountName = () => ORBITAL_API_KEY_ACCOUNT;
 
-export const getStoredApiKey = async (provider = "gemini") => {
+export const getStoredApiKey = async () => {
   const keytar = await loadKeytar();
-  const account = getApiKeyAccountName(provider);
-  let value = await keytar.getPassword(ORBITAL_KEYTAR_SERVICE, account);
-
-  // Backward-compatibility for Gemini: fall back to legacy ORBITAL_API_KEY_ACCOUNT
-  const p = (provider || "gemini").toLowerCase().trim();
-  if (!value && (p === "gemini" || p === "google")) {
-    value = await keytar.getPassword(
-      ORBITAL_KEYTAR_SERVICE,
-      ORBITAL_API_KEY_ACCOUNT
-    );
-  }
-
+  const value = await keytar.getPassword(
+    ORBITAL_KEYTAR_SERVICE,
+    ORBITAL_API_KEY_ACCOUNT
+  );
   return typeof value === "string" ? value.trim() : "";
 };
 
-export const storeApiKey = async (apiKey, provider = "gemini") => {
+export const storeApiKey = async (apiKey) => {
   const trimmed = typeof apiKey === "string" ? apiKey.trim() : "";
   if (!trimmed) throw new Error("API key is required");
 
   const keytar = await loadKeytar();
-  const account = getApiKeyAccountName(provider);
-  await keytar.setPassword(ORBITAL_KEYTAR_SERVICE, account, trimmed);
-
-  // For Gemini, also keep legacy account updated for backward compatibility
-  const p = (provider || "gemini").toLowerCase().trim();
-  if (p === "gemini" || p === "google") {
-    await keytar.setPassword(
-      ORBITAL_KEYTAR_SERVICE,
-      ORBITAL_API_KEY_ACCOUNT,
-      trimmed
-    );
-  }
-
+  await keytar.setPassword(
+    ORBITAL_KEYTAR_SERVICE,
+    ORBITAL_API_KEY_ACCOUNT,
+    trimmed
+  );
   return true;
 };
 
-export const deleteStoredApiKey = async (provider = "gemini") => {
+export const deleteStoredApiKey = async () => {
   const keytar = await loadKeytar();
-  const account = getApiKeyAccountName(provider);
-  await keytar.deletePassword(ORBITAL_KEYTAR_SERVICE, account);
-
-  const p = (provider || "gemini").toLowerCase().trim();
-  if (p === "gemini" || p === "google") {
-    await keytar.deletePassword(
-      ORBITAL_KEYTAR_SERVICE,
-      ORBITAL_API_KEY_ACCOUNT
-    );
-  }
-
+  await keytar.deletePassword(ORBITAL_KEYTAR_SERVICE, ORBITAL_API_KEY_ACCOUNT);
   return true;
 };
-