@dubeyvishal/orbital-cli 1.0.4 → 1.0.5

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

@@ -11,17 +11,17 @@ import {
 import yoctoSpinner from "yocto-spinner";
 import { marked } from "marked";
 import { markedTerminal } from "marked-terminal";
-import { AIService } from "../ai/googleService.js";
-import { ChatServiceClient as ChatService } from "../utils/chatServiceClient.js";
-import { getStoredToken } from "../utils/token.js";
-
+import { getStoredToken } from "../../lib/token.js";
 import {
   availableTools,
   enableTools,
   getEnabledTools,
   getEnabledToolNames,
   resetTools,
-} from "../config/toolConfig.js";
+} from "../../config/toolConfig.js";
+import { apiRequestSafe } from "../utils/apiClient.js";
+import { AIService } from "../ai/googleService.js";
+import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
 
 marked.use(
   markedTerminal({
@@ -42,9 +42,6 @@ marked.use(
   })
 );
 
-let aiService;
-const chatService = new ChatService();
-
 const getUserFromToken = async () => {
   const token = await getStoredToken();
 
@@ -54,28 +51,20 @@ const getUserFromToken = async () => {
 
   const spinner = yoctoSpinner({ text: "Authenticating..." }).start();
 
-  let user;
   try {
-    const response = await fetch("https://smart-cli-based-agent.onrender.com/api/me", {
-      headers: {
-        Authorization: `Bearer ${token.access_token}`
-      }
-    });
+    const result = await apiRequestSafe("/api/cli/me");
+    const user = result?.user;
 
-    if (!response.ok) {
-        throw new Error("Failed to authenticate.");
+    if (!user) {
+      spinner.error("User not found");
+      throw new Error("User not found. Please login again");
     }
-    const data = await response.json();
-    user = data?.user;
 
-    if (!user) throw new Error("User not found");
-  } catch(err) {
-      spinner.error("Authentication failed");
-      throw new Error("User not found or connection failed. Please login again.");
+    spinner.success(`Welcome back, ${user.name}!`);
+    return user;
+  } finally {
+    spinner.stop();
   }
-
-  spinner.success(`Welcome back, ${user.name}!`);
-  return user;
 };
 
 const selectTools = async () => {
@@ -132,17 +121,18 @@ const selectTools = async () => {
     console.log(toolBox);
   }
 
-  return selectedTools.length > 0;
+  return selectedTools;
 };
 
 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",
+    body: { conversationId, mode },
+  });
 
-  const conversation = await chatService.getOrCreateConversation(
-    userId,
-    conversationId,
-    mode
-  );
+  const conversation = result?.conversation;
+  const messages = result?.messages || [];
 
   spinner.success("Conversation Loaded");
 
@@ -168,9 +158,9 @@ const initConversation = async (userId, conversationId = null, mode = "tool") =>
 
   console.log(conversationInfo);
 
-  if (conversation.messages?.length > 0) {
+  if (messages.length > 0) {
     console.log(chalk.yellow("Previous Messages:\n"));
-    displayMessages(conversation.messages);
+    displayMessages(messages);
   }
 
   return conversation;
@@ -206,54 +196,52 @@ const displayMessages = (messages) => {
 const updateConversationTitle = async (conversationId, userInput, messageCount) => {
   if (messageCount === 1) {
     const title = userInput.slice(0, 50) + (userInput.length > 50 ? "..." : "");
-    await chatService.updateTitle(conversationId, title);
+    await apiRequestSafe(`/api/cli/conversations/${conversationId}/title`, {
+      method: "PATCH",
+      body: { title },
+    });
   }
 };
 
 const saveMessage = async (conversationId, role, content) => {
-  return await chatService.addMessage(conversationId, role, content);
+  return await apiRequestSafe("/api/cli/messages", {
+    method: "POST",
+    body: { conversationId, role, content },
+  });
 };
 
-const getAIResponse = async (conversationId) => {
+const getAIResponse = async (conversationId, toolIds = []) => {
   const spinner = yoctoSpinner({ text: "AI is thinking..." }).start();
-
-  const dbMessages = await chatService.getMessages(conversationId);
-  const aiMessages = chatService.formatMessageForAI(dbMessages);
-
-  const tools = getEnabledTools();
-
   let fullResponse = "";
-  let isFirstChunk = true;
   const toolCallsDetected = [];
 
   try {
-    const result = await aiService.sendMessage(
-      aiMessages,
-      (chunk) => {
-        if (isFirstChunk) {
-          spinner.stop();
-          console.log("\n");
-          console.log(chalk.green.bold("Assistant: "));
-          console.log(chalk.gray("-".repeat(60)));
-          isFirstChunk = false;
-        }
-        fullResponse += chunk;
-      },
-      tools,
-      (toolCall) => {
-        toolCallsDetected.push(toolCall);
-      }
+    const messageResult = await apiRequestSafe(
+      `/api/cli/messages?conversationId=${encodeURIComponent(conversationId)}`,
+      { method: "GET" }
     );
 
-    // If the model returned without streaming any chunks, stop the spinner here
-    // so it doesn't keep animating into the next prompt.
-    if (isFirstChunk) {
-      spinner.stop();
-      console.log("\n");
-      console.log(chalk.green.bold("Assistant: "));
-      console.log(chalk.gray("-".repeat(60)));
-      isFirstChunk = false;
-    }
+    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: "));
+    console.log(chalk.gray("-".repeat(60)));
+
+    fullResponse = result?.content || "";
+    if (Array.isArray(result?.toolCalls)) toolCallsDetected.push(...result.toolCalls);
 
     if (toolCallsDetected.length > 0) {
       console.log("\n");
@@ -305,14 +293,14 @@ const getAIResponse = async (conversationId) => {
     console.log(chalk.gray("-".repeat(60)));
     console.log("\n");
 
-    return result?.content ?? fullResponse.trim();
+    return fullResponse.trim();
   } catch (error) {
     spinner.error("Failed to get AI response");
     throw error;
   }
 };
 
-const chatLoop = async (conversation) => {
+const chatLoop = async (conversation, selectedToolIds = []) => {
   const enabledToolNames = getEnabledToolNames();
 
   const helpText = [
@@ -381,25 +369,24 @@ const chatLoop = async (conversation) => {
     );
 
     await saveMessage(conversation.id, "user", userInput);
-    const messages = await chatService.getMessages(conversation.id);
+    const messageResult = await apiRequestSafe(
+      `/api/cli/messages?conversationId=${encodeURIComponent(conversation.id)}`,
+      { method: "GET" }
+    );
 
-    const aiResponse = await getAIResponse(conversation.id);
+    const aiResponse = await getAIResponse(conversation.id, selectedToolIds);
     await saveMessage(conversation.id, "assistant", aiResponse);
 
-    await updateConversationTitle(conversation.id, userInput, messages.length);
+    await updateConversationTitle(
+      conversation.id,
+      userInput,
+      messageResult?.messages?.length || 0
+    );
   }
 };
 
 export const startToolChat = async (conversationId) => {
   try {
-    if (!process.env.GOOGLE_GENERATIVE_AI_API_KEY) {
-      throw new Error(
-        "Gemini API key is not set. Run: orbital setkey <your-gemini-api-key>"
-      );
-    }
-
-    aiService = new AIService();
-
     intro(
       boxen(chalk.bold.cyan("Orbital AI - Tool Calling Mode"), {
         padding: 1,
@@ -410,11 +397,11 @@ export const startToolChat = async (conversationId) => {
 
     const user = await getUserFromToken();
 
-    await selectTools();
+    const selectedToolIds = await selectTools();
 
     const conversation = await initConversation(user.id, conversationId, "tool");
 
-    await chatLoop(conversation);
+    await chatLoop(conversation, selectedToolIds);
 
     resetTools();
     outro(chalk.green("Thanks for using tools"));

package/server/{chat → src/cli/chat}/chat-with-ai.js

@@ -4,10 +4,10 @@ import {text , isCancel , cancel , intro , outro }from "@clack/prompts";
 import yoctoSpinner from "yocto-spinner";
 import {marked} from "marked";
 import {markedTerminal} from "marked-terminal";
-import {AIService} from "../ai/googleService.js";
-import { ChatServiceClient as ChatService } from "../utils/chatServiceClient.js";
-import {getStoredToken} from "../utils/token.js";
-
+import {getStoredToken} from "../../lib/token.js";
+import { apiRequestSafe } from "../utils/apiClient.js";
+import { AIService } from "../ai/googleService.js";
+import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
 
 marked.use(
     markedTerminal({
@@ -28,9 +28,6 @@ marked.use(
     })
 )
 
-let aiService;
-const chatService = new ChatService();
-
 const getUserFromToken = async()=>{
     const token = await getStoredToken()
     if(!token?.access_token){
@@ -38,37 +35,29 @@ const getUserFromToken = async()=>{
     }
 
     const spinner = yoctoSpinner({text: "Authenticating..."}).start();
-
-    let user;
     try {
-      const response = await fetch("https://smart-cli-based-agent.onrender.com/api/me", {
-        headers: {
-          Authorization: `Bearer ${token.access_token}`
+        const result = await apiRequestSafe("/api/cli/me");
+        const user = result?.user;
+        if(!user){
+            spinner.error("User not found");
+            throw new Error("User not found. Please login again");
         }
-      });
-      if (!response.ok) {
-          throw new Error("Failed to authenticate.");
-      }
-      const data = await response.json();
-      user = data?.user;
-      if (!user) throw new Error("User not found");
-    } catch(err) {
-        spinner.error("Authentication failed");
-        throw new Error("User not found or connection failed. Please login again.");
+        spinner.success(`Welcome back , ${user.name}!`);
+        return user;
+    } finally {
+        spinner.stop();
     }
-
-    spinner.success(`Welcome back , ${user.name}!`);
-    return user;
 }
 
 const initConversation = async(userId , conversationId = null , mode = "chat")=>{
     const spinner = yoctoSpinner({text : "Loading conservation ..."}).start();
 
-    const conversation = await chatService.getOrCreateConversation(
-        userId ,
-        conversationId ,
-        mode
-    )
+    const result = await apiRequestSafe("/api/cli/conversations/init", {
+        method: "POST",
+        body: { conversationId, mode },
+    });
+    const conversation = result?.conversation;
+    const messages = result?.messages || [];
     spinner.success("Conversation Loaded");
 
     const conversationInfo = boxen(
@@ -84,9 +73,9 @@ const initConversation = async(userId , conversationId = null , mode = "chat")=>
     );
     console.log(conversationInfo);
 
-    if(conversation.messages?.length > 0){
+    if(messages.length > 0){
         console.log(chalk.yellow("Previous Messsages: \n"));
-        displayMessages(conversation.messages);
+        displayMessages(messages);
     }
 
     return conversation ;
@@ -120,7 +109,10 @@ const displayMessages = (messages) => {
 };
 
 const saveMessage = async(conversationId , role , content) =>{
-    return await chatService.addMessage(conversationId , role , content)
+    return await apiRequestSafe("/api/cli/messages", {
+        method: "POST",
+        body: { conversationId, role, content },
+    });
 }
 
 const getAIResponse  = async(conversationId)=>{
@@ -129,40 +121,34 @@ const getAIResponse  = async(conversationId)=>{
         color: "cyan"
     }).start();
 
-    const dbMessages = await chatService.getMessages(conversationId);
-    const aiMessages =  chatService.formatMessageForAI(dbMessages);
-
     let fullResponse = "";
-    let isFirstChunk = true ;
      try{
-        const result = await aiService.sendMessage(aiMessages , (chunk)=>{
-            if(isFirstChunk){
-                spinner.stop();
-                console.log("\n");
-                const header = chalk.green.bold("Assistent: ");
-                console.log(header);
-                console.log(chalk.gray("-".repeat(60)));
-                isFirstChunk = false ;
-            }
-            fullResponse += chunk ;
-        });
+        const messageResult = await apiRequestSafe(
+            `/api/cli/messages?conversationId=${encodeURIComponent(conversationId)}`,
+            { method: "GET" }
+        );
 
-        if(isFirstChunk){
-            spinner.stop();
-            console.log("\n");
-            const header = chalk.green.bold("Assistent: ");
-            console.log(header);
-            console.log(chalk.gray("-".repeat(60)));
-            isFirstChunk = false;
-        }
+        const messages = Array.isArray(messageResult?.messages) ? messageResult.messages : [];
+        const aiMessages = messages.map((m) => ({ role: m.role, content: m.content }));
+
+        await requireGeminiApiKey();
+        const aiService = new AIService();
+        const result = await aiService.sendMessage(aiMessages);
 
+        spinner.stop();
+        console.log("\n");
+        const header = chalk.green.bold("Assistent: ");
+        console.log(header);
+        console.log(chalk.gray("-".repeat(60)));
+
+        fullResponse = result?.content || "";
         console.log("\n");
         const renderMarkdown = marked.parse(fullResponse);
         console.log(renderMarkdown);
         console.log(chalk.gray("-".repeat(60)));
         console.log("\n");
 
-        return result.content ;
+        return fullResponse ;
      }
      catch(error){
         spinner.error("Failed to get AI response");
@@ -173,7 +159,10 @@ const getAIResponse  = async(conversationId)=>{
 const updateConversationTitle = async(conversationId , userInput , messageCount)=>{
     if(messageCount ===1){
         const title = userInput.slice(0,50) + (userInput.length > 50 ? "..." : "");
-        await chatService.updateTitle(conversationId , title);
+        await apiRequestSafe(`/api/cli/conversations/${conversationId}/title`, {
+            method: "PATCH",
+            body: { title },
+        });
     }
 }
 
@@ -223,12 +212,19 @@ const chatLoop = async(conversation)=>{
             break ;
         }
         await saveMessage(conversation.id ,  "user" , userInput);
-        const messages = await chatService.getMessages(conversation.id);
+        const messageResult = await apiRequestSafe(
+            `/api/cli/messages?conversationId=${encodeURIComponent(conversation.id)}`,
+            { method: "GET" }
+        );
 
         const aiResponse = await getAIResponse(conversation.id);
-         await saveMessage(conversation.id ,  "assistant" , aiResponse);
+        await saveMessage(conversation.id ,  "assistant" , aiResponse);
 
-         await updateConversationTitle(conversation.id , userInput , messages.length)
+        await updateConversationTitle(
+            conversation.id ,
+            userInput ,
+            messageResult?.messages?.length || 0
+        )
     }
 }
 
@@ -236,14 +232,6 @@ const chatLoop = async(conversation)=>{
 
 export const startChat = async(mode="chat" , conversationId = null)=>{
     try{
-        if (!process.env.GOOGLE_GENERATIVE_AI_API_KEY) {
-            throw new Error(
-                "Gemini API key is not set. Run: orbital setkey <your-gemini-api-key>"
-            );
-        }
-
-        aiService = new AIService();
-
         intro(
             boxen(chalk.bold.cyan("Orbital AI Chat") , {
                 padding: 1 ,

package/server/{commands → src/cli/commands}/General/openApp.js

@@ -1,21 +1,26 @@
 import chalk from "chalk";
 import { Command } from "commander";
 import yoctoSpinner from "yocto-spinner";
-import { getApiClient } from "../../utils/apiClient.js";
-import {openGithub , openLinkedin ,  openLeetcode , openGmail , openWhatsApp} from "../../generalApp/Apps.js"
+import { getStoredToken } from "../../../lib/token.js";
+import { select } from "@clack/prompts";
+import {openGithub , openLinkedin ,  openLeetcode , openGmail , openWhatsApp} from "../../../cli/generalApp/Apps.js"
+import { apiRequestSafe } from "../../utils/apiClient.js";
 
 const openAppAction = async () => {
+  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 api = await getApiClient();
-    const res = await api.get("/api/me");
-    user = res.user;
-  } catch (err) {
-    console.log(chalk.red(err.message));
-    return;
+    const result = await apiRequestSafe("/api/cli/me");
+    user = result?.user;
   } finally {
     spinner.stop();
   }

package/server/{commands → src/cli/commands}/ai/wakeUp.js

@@ -1,38 +1,36 @@
 import chalk from "chalk";
 import {Command} from "commander";
 import yoctoSpinner  from "yocto-spinner";
-import {getStoredToken} from "../../utils/token.js"
-
+import {getStoredToken} from "../../../lib/token.js"
 import {select} from "@clack/prompts";
-import {startChat} from "../../chat/chat-with-ai.js";
-import {startToolChat} from "../../chat/chat-with-ai-tools.js";
-import {startAgentChat} from "../../chat/chat-with-ai-agent.js";
+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 { requireGeminiApiKey } from "../../../lib/orbitalConfig.js";
 
 
 const wakeUpAction = async()=>{
+    try {
+        await requireGeminiApiKey();
+    } catch {
+        console.log(chalk.red("Gemini API key not set. Run: orbital set-key <API_KEY>"));
+        return;
+    }
+
     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 response = await fetch("https://smart-cli-based-agent.onrender.com/api/me", {
-          headers: {
-            Authorization: `Bearer ${token.access_token}`
-          }
-        });
-
-        if (!response.ok) {
-            throw new Error("Failed to authenticate.");
-        }
-        const data = await response.json();
-        user = data?.user;
-
-        if (!user) throw new Error("User not found");
-     } catch(err) {
-         console.log(chalk.red("Failed to authenticate with server."));
+        const result = await apiRequestSafe("/api/cli/me");
+        user = result?.user;
      }
      finally{
         spinner.stop();

package/server/{commands → src/cli/commands}/auth/aboutMe.js

@@ -1,8 +1,9 @@
 import chalk from "chalk";
 import { Command } from "commander";
-import { requireAuth } from "../../utils/token.js";
+import { requireAuth } from "../../../lib/token.js";
+import { API_BASE } from "../../../config/api.js";
 
-const DEFAULT_SERVER_URL = "https://smart-cli-based-agent.onrender.com";
+const DEFAULT_SERVER_URL = API_BASE;
 
 export const whoAmIAction = async (cmdOptions = {})=>{
     const token = await requireAuth();

package/server/{commands → src/cli/commands}/auth/login.js

@@ -1,3 +1,4 @@
+import "../../../config/env.js";
 import { cancel, confirm, intro, outro, isCancel } from "@clack/prompts";
 import chalk from "chalk";
 import { Command } from "commander";
@@ -10,25 +11,37 @@ import { createAuthClient } from "better-auth/client";
 import { deviceAuthorizationClient } from "better-auth/client/plugins";
 import { logger } from "better-auth";
 import { fileURLToPath } from "url";
-import { getStoredToken, isTokenExpired, storeToken ,TOKEN_FILE } from "../../utils/token.js";
+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);
 const __dirname = path.dirname(__filename);
 
-const URL = "https://smart-cli-based-agent.onrender.com";
-const CLIENT_ID = process.env.GITHUB_CLIENT_ID;
+const URL = API_BASE;
+
+const resolveClientId = async (cliClientId) => {
+  const resolved = (cliClientId || "").trim();
+  if (resolved.length > 0) return resolved;
+
+  const response = await apiRequestSafe("/auth/github/client-id", {
+    method: "GET",
+    requireAuth: false,
+  });
+
+  const clientId = typeof response?.client_id === "string" ? response.client_id.trim() : "";
+  return clientId.length > 0 ? clientId : undefined;
+};
 
 
 export const loginAction = async (cmdOptions) => {
-  if (!process.env.GOOGLE_GENERATIVE_AI_API_KEY) {
-    console.log(chalk.red("Gemini API key is not set."));
-    console.log(
-      chalk.gray(
-        "Run: orbital setkey <your-gemini-api-key>\nThen run: orbital login",
-      ),
-    );
+  try {
+    await requireGeminiApiKey();
+  } catch {
+    console.log(chalk.red("Gemini API key not set. Run: orbital set-key <API_KEY>"));
     process.exit(1);
   }
 
@@ -43,7 +56,17 @@ export const loginAction = async (cmdOptions) => {
   });
 
   const serverUrl = options.serverUrl || URL;
-  const clientId = options.clientId || CLIENT_ID;
+  const clientId = await resolveClientId(options.clientId);
+
+  if (!clientId) {
+    console.error(chalk.red("GitHub OAuth client ID is not available from the server."));
+    console.log(
+      chalk.gray(
+        "Make sure the backend is deployed and configured with GITHUB_CLIENT_ID.",
+      ),
+    );
+    process.exit(1);
+  }
 
   intro(chalk.bold("Auth CLI Login"));
 
@@ -238,5 +261,5 @@ const pollForToken = async (
 export const login = new Command("login")
   .description("Login to Better Auth")
   .option("--server-url <url>", "The Better Auth server URL", URL)
-  .option("--client-id <id>", "The OAuth client ID", CLIENT_ID)
+  .option("--client-id <id>", "The OAuth client ID")
   .action(loginAction);

package/server/{commands → src/cli/commands}/auth/logout.js

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { cancel, confirm, intro, outro, isCancel } from "@clack/prompts";
 import { Command } from "commander";
-import { clearStoredToken, getStoredToken } from "../../utils/token.js";
+import { clearStoredToken, getStoredToken } from "../../../lib/token.js";
 
 export const logoutAction = async()=>{
     intro(chalk.bold("Logout"));