@dubeyvishal/orbital-cli 1.0.3 → 1.0.5

package/README.md

@@ -6,6 +6,19 @@ Built with **Next.js**, **Node.js**, **Express**, and **Commander.js**, with sec
 
 ---
 
+## 📸 Project Screenshots
+
+### 🔐 Orbital Login Screen
+![Orbital Login Screen](./images/pic1.png)
+
+### 🛠️ Orbital Wakeup – Tools Loaded
+![Orbital Wakeup](./images/pic2.png)
+
+### 🤖 Agentic Mode
+![Agentic Mode](./images/pic3.png)
+
+---
+
 ## ✨ Features
 
 ###  AI Chat Mode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubeyvishal/orbital-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "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",
@@ -31,6 +31,7 @@
     "commander": "^14.0.2",
     "dotenv": "^17.2.3",
     "figlet": "^1.9.4",
+    "keytar": "^7.9.0",
     "marked": "^15.0.12",
     "marked-terminal": "^7.3.0",
     "open": "^11.0.0",

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

@@ -2,15 +2,14 @@ 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";
 
 export class AIService {
   constructor() {
-    if (!config.googleApiKey) {
-      throw new Error("GOOGLE_GENERATIVE_AI_API_KEY is not set in env");
-    }
+    const apiKey = requireGeminiApiKeySync();
 
     this.model = google(config.model, {
-      apiKey: config.googleApiKey,
+      apiKey,
     });
   }
 

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

@@ -4,18 +4,18 @@ import { text, isCancel, cancel, intro, outro, confirm } from "@clack/prompts";
 import yoctoSpinner from "yocto-spinner";
 import { marked } from "marked";
 import { markedTerminal } from "marked-terminal";
-import { AIService } from "../ai/googleService.js";
-import { ChatService } from "../../service/chatService.js";
 import { getStoredToken } from "../../lib/token.js";
-import prisma from "../../lib/db.js";
-import { ensureDbConnection } from "../../lib/dbHealth.js";
-import { generateApplication } from "../../config/agentConfig.js";
+import {
+  createApplicationFiles,
+  displayFileTree,
+  generateApplicationPlan,
+} from "../../config/agentConfig.js";
+import { apiRequestSafe } from "../utils/apiClient.js";
+import { AIService } from "../ai/googleService.js";
+import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
 
 marked.use(markedTerminal());
 
-let aiService;
-const chatService = new ChatService();
-
 const getEnabledToolNames = () => {
   return [];
 };
@@ -27,40 +27,31 @@ const getUserFromToken = async () => {
     throw new Error("Not authenticated. Please run 'orbital login' first.");
   }
 
-  const dbOk = await ensureDbConnection();
-  if (!dbOk) {
-    throw new Error(
-      "Database unavailable. Fix DATABASE_URL/connectivity and try again."
-    );
-  }
-
   const spinner = yoctoSpinner({ text: "Authenticating..." }).start();
+  try {
+    const result = await apiRequestSafe("/api/cli/me");
+    const user = result?.user;
 
-  const user = await prisma.user.findFirst({
-    where: {
-      sessions: {
-        some: { token: token.access_token },
-      },
-    },
-  });
+    if (!user) {
+      spinner.error("User not found");
+      throw new Error("User not found. Please login again");
+    }
 
-  if (!user) {
-    spinner.error("User not found");
-    throw new Error("User not found. 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 = "tool") => {
   const spinner = yoctoSpinner({ text: "Loading conversation..." }).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;
 
   spinner.success("Conversation Loaded");
 
@@ -91,7 +82,10 @@ const initConversation = async (userId, conversationId = null, mode = "tool") =>
 };
 
 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 agentLoop = async (conversation) => {
@@ -155,21 +149,27 @@ const agentLoop = async (conversation) => {
     await saveMessage(conversation.id, "user", userInput);
 
     try {
-      const result = await generateApplication(
-        userInput,
-        aiService,
-        process.cwd()
-      );
+      await requireGeminiApiKey();
+      const aiService = new AIService();
+      const application = await generateApplicationPlan(userInput, aiService);
 
-      if (!result || !result.success) {
-        throw new Error("Generation returned no result.");
+      if (!application || !Array.isArray(application.files) || application.files.length === 0) {
+        throw new Error("Generation returned no files.");
       }
 
+      displayFileTree(application.files, application.folderName);
+
+      const appDir = await createApplicationFiles(
+        process.cwd(),
+        application.folderName,
+        application.files
+      );
+
       const responseMessage =
-        `Generated application: ${result.folderName}\n` +
-        `Files created: ${result.files.length}\n` +
-        `Location: ${result.appDir}\n\n` +
-        `Setup commands:\n${result.commands.join("\n")}`;
+        `Generated application: ${application.folderName}\n` +
+        `Files created: ${application.files.length}\n` +
+        `Location: ${appDir}\n\n` +
+        `Setup commands:\n${(application.setupCommands || []).join("\n")}`;
 
       console.log(
         boxen(chalk.green(responseMessage), {
@@ -211,14 +211,6 @@ const agentLoop = async (conversation) => {
 
 export const startAgentChat = async (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.magenta("Orbital AI - Agent Mode\n\n") +

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

@@ -11,11 +11,7 @@ import {
 import yoctoSpinner from "yocto-spinner";
 import { marked } from "marked";
 import { markedTerminal } from "marked-terminal";
-import { AIService } from "../ai/googleService.js";
-import { ChatService } from "../../service/chatService.js";
 import { getStoredToken } from "../../lib/token.js";
-import prisma from "../../lib/db.js";
-import { ensureDbConnection } from "../../lib/dbHealth.js";
 import {
   availableTools,
   enableTools,
@@ -23,6 +19,9 @@ import {
   getEnabledToolNames,
   resetTools,
 } 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({
@@ -43,9 +42,6 @@ marked.use(
   })
 );
 
-let aiService;
-const chatService = new ChatService();
-
 const getUserFromToken = async () => {
   const token = await getStoredToken();
 
@@ -53,28 +49,22 @@ const getUserFromToken = async () => {
     throw new Error("Not authenticated. Please run 'orbital login' first.");
   }
 
-  const dbOk = await ensureDbConnection();
-  if (!dbOk) {
-    throw new Error("Database unavailable. Fix DATABASE_URL/connectivity and try again.");
-  }
-
   const spinner = yoctoSpinner({ text: "Authenticating..." }).start();
 
-  const user = await prisma.user.findFirst({
-    where: {
-      sessions: {
-        some: { token: token.access_token },
-      },
-    },
-  });
+  try {
+    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 (!user) {
+      spinner.error("User not found");
+      throw new Error("User not found. Please login again");
+    }
 
-  spinner.success(`Welcome back, ${user.name}!`);
-  return user;
+    spinner.success(`Welcome back, ${user.name}!`);
+    return user;
+  } finally {
+    spinner.stop();
+  }
 };
 
 const selectTools = async () => {
@@ -88,7 +78,7 @@ const selectTools = async () => {
   const toolOptions = availableTools.map((tool) => ({
     value: tool.id,
     label: tool.name,
-    // Long hints wrap in the terminal and look like duplicated options.
+    
     hint: truncateHint(tool.description),
   }));
 
@@ -131,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");
 
@@ -167,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;
@@ -205,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");
@@ -304,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 = [
@@ -380,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,
@@ -409,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/src/cli/chat/chat-with-ai.js

@@ -4,11 +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 {ChatService} from "../../service/chatService.js"
 import {getStoredToken} from "../../lib/token.js";
-import prisma from "../../lib/db.js"
-import { ensureDbConnection } from "../../lib/dbHealth.js";
+import { apiRequestSafe } from "../utils/apiClient.js";
+import { AIService } from "../ai/googleService.js";
+import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
 
 marked.use(
     markedTerminal({
@@ -29,43 +28,36 @@ marked.use(
     })
 )
 
-let aiService;
-const chatService = new ChatService();
-
 const getUserFromToken = async()=>{
     const token = await getStoredToken()
     if(!token?.access_token){
         throw new Error("Not authenticated. Please run 'orbital login' first.");
     }
 
-    const dbOk = await ensureDbConnection();
-    if(!dbOk){
-        throw new Error("Database unavailable. Fix DATABASE_URL/connectivity and try again.");
-    }
-
     const spinner = yoctoSpinner({text: "Authenticating..."}).start();
-    const user = await prisma.user.findFirst({
-        where : {
-            sessions : {
-            some : {token : token.access_token} ,
-        }}
-    });
-    if(!user){
-        spinner.error("User not found");
-            throw new Error("User not found. Please login again");     
+    try {
+        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");
+        }
+        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(
@@ -81,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 ;
@@ -117,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)=>{
@@ -126,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");
@@ -170,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 },
+        });
     }
 }
 
@@ -220,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
+        )
     }
 }
 
@@ -233,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 ,