@dubeyvishal/orbital-cli 1.0.4 → 1.0.5

package/package.json

@@ -1,22 +1,17 @@
 {
   "name": "@dubeyvishal/orbital-cli",
-  "version": "1.0.4",
+  "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",
   "private": false,
   "type": "module",
   "bin": {
-    "orbital": "server/main.js"
+    "orbital": "server/src/cli/main.js"
   },
   "files": [
-    "server/main.js",
-    "server/commands",
-    "server/chat",
-    "server/ai",
-    "server/config",
-    "server/generalApp",
-    "server/utils",
+    "server/src",
+    "server/prisma",
     "README.md"
   ],
   "publishConfig": {
@@ -36,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",
@@ -44,6 +40,8 @@
     "zod": "^4.3.5"
   },
   "scripts": {
+    "postinstall": "cd server && npx prisma generate",
+    "install-all": "npm install --prefix client && npm install --prefix server",
     "start-client": "npm start --prefix client",
     "start-server": "npm start --prefix server",
     "dev": "npm run start-server && npm run start-client"
@@ -56,4 +54,4 @@
     "client-server",
     "javascript"
   ]
-}
+}

package/server/prisma/migrations/20260105143219_test_migration/migration.sql

@@ -0,0 +1,7 @@
+-- CreateTable
+CREATE TABLE "Test" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+
+    CONSTRAINT "Test_pkey" PRIMARY KEY ("id")
+);

package/server/prisma/migrations/20260105151026_authentication/migration.sql

@@ -0,0 +1,78 @@
+-- CreateTable
+CREATE TABLE "user" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "emailVerified" BOOLEAN NOT NULL DEFAULT false,
+    "image" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "user_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "session" (
+    "id" TEXT NOT NULL,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "token" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "ipAddress" TEXT,
+    "userAgent" TEXT,
+    "userId" TEXT NOT NULL,
+
+    CONSTRAINT "session_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "account" (
+    "id" TEXT NOT NULL,
+    "accountId" TEXT NOT NULL,
+    "providerId" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "accessToken" TEXT,
+    "refreshToken" TEXT,
+    "idToken" TEXT,
+    "accessTokenExpiresAt" TIMESTAMP(3),
+    "refreshTokenExpiresAt" TIMESTAMP(3),
+    "scope" TEXT,
+    "password" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "account_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "verification" (
+    "id" TEXT NOT NULL,
+    "identifier" TEXT NOT NULL,
+    "value" TEXT NOT NULL,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "verification_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_email_key" ON "user"("email");
+
+-- CreateIndex
+CREATE INDEX "session_userId_idx" ON "session"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "session_token_key" ON "session"("token");
+
+-- CreateIndex
+CREATE INDEX "account_userId_idx" ON "account"("userId");
+
+-- CreateIndex
+CREATE INDEX "verification_identifier_idx" ON "verification"("identifier");
+
+-- AddForeignKey
+ALTER TABLE "session" ADD CONSTRAINT "session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "account" ADD CONSTRAINT "account_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/server/prisma/migrations/20260114105919_add_devicecode_conversation_message/migration.sql

@@ -0,0 +1,50 @@
+-- CreateTable
+CREATE TABLE "deviceCode" (
+    "id" TEXT NOT NULL,
+    "deviceCode" TEXT NOT NULL,
+    "userCode" TEXT NOT NULL,
+    "userId" TEXT,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "status" TEXT NOT NULL,
+    "lastPolledAt" TIMESTAMP(3),
+    "pollingInterval" INTEGER,
+    "clientId" TEXT,
+    "scope" TEXT,
+
+    CONSTRAINT "deviceCode_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "conversation" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "title" TEXT NOT NULL,
+    "mode" TEXT NOT NULL DEFAULT 'chat',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "conversation_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "message" (
+    "id" TEXT NOT NULL,
+    "conversationId" TEXT NOT NULL,
+    "role" TEXT NOT NULL,
+    "content" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "message_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "conversation_userId_idx" ON "conversation"("userId");
+
+-- CreateIndex
+CREATE INDEX "message_conversationId_idx" ON "message"("conversationId");
+
+-- AddForeignKey
+ALTER TABLE "conversation" ADD CONSTRAINT "conversation_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "message" ADD CONSTRAINT "message_conversationId_fkey" FOREIGN KEY ("conversationId") REFERENCES "conversation"("id") ON DELETE CASCADE ON UPDATE CASCADE;

package/server/prisma/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "postgresql"

package/server/prisma/schema.prisma

@@ -0,0 +1,117 @@
+generator client {
+  provider = "prisma-client-js"
+}
+
+datasource db {
+  provider = "postgresql"
+  url      = env("DATABASE_URL")
+  directUrl = env("DIRECT_DATABASE_URL")
+}
+
+model Test {
+  id   String @id @default(cuid())
+  name String
+}
+
+model User {
+  id            String         @id @default(cuid())
+  name          String
+  email         String         @unique
+  emailVerified Boolean        @default(false)
+  image         String?
+  createdAt     DateTime       @default(now())
+  updatedAt     DateTime       @updatedAt
+  accounts      Account[]
+  conversations Conversation[]
+  sessions      Session[]
+
+  @@map("user")
+}
+
+model Session {
+  id        String   @id @default(cuid())
+  expiresAt DateTime
+  token     String   @unique
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  ipAddress String?
+  userAgent String?
+  userId    String
+  user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId])
+  @@map("session")
+}
+
+model Account {
+  id                    String    @id @default(cuid())
+  accountId             String
+  providerId            String
+  userId                String
+  accessToken           String?
+  refreshToken          String?
+  idToken               String?
+  accessTokenExpiresAt  DateTime?
+  refreshTokenExpiresAt DateTime?
+  scope                 String?
+  password              String?
+  createdAt             DateTime  @default(now())
+  updatedAt             DateTime  @updatedAt
+  user                  User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@index([userId])
+  @@map("account")
+}
+
+model Verification {
+  id         String   @id @default(cuid())
+  identifier String
+  value      String
+  expiresAt  DateTime
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
+
+  @@index([identifier])
+  @@map("verification")
+}
+
+model DeviceCode {
+  id              String    @id @default(cuid())
+  deviceCode      String
+  userCode        String
+  userId          String?
+  expiresAt       DateTime
+  status          String
+  lastPolledAt    DateTime?
+  pollingInterval Int?
+  clientId        String?
+  scope           String?
+
+  @@map("deviceCode")
+}
+
+model Conversation {
+  id        String    @id @default(cuid())
+  userId    String
+  title     String
+  mode      String    @default("chat")
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  user      User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  messages  Message[]
+
+  @@index([userId])
+  @@map("conversation")
+}
+
+model Message {
+  id             String       @id @default(cuid())
+  conversationId String
+  role           String
+  content        String
+  createdAt      DateTime     @default(now())
+  conversation   Conversation @relation(fields: [conversationId], references: [id], onDelete: Cascade)
+
+  @@index([conversationId])
+  @@map("message")
+}

package/server/{ai → src/cli/ai}/googleService.js

@@ -1,16 +1,15 @@
 import { google } from "@ai-sdk/google";
 import { streamText, generateObject } from "ai";
-import { config } from "../config/googleConfig.js";
+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/{chat → src/cli/chat}/chat-with-ai-agent.js

@@ -4,17 +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 { getStoredToken } from "../../lib/token.js";
+import {
+  createApplicationFiles,
+  displayFileTree,
+  generateApplicationPlan,
+} from "../../config/agentConfig.js";
+import { apiRequestSafe } from "../utils/apiClient.js";
 import { AIService } from "../ai/googleService.js";
-import { ChatServiceClient as ChatService } from "../utils/chatServiceClient.js";
-import { getStoredToken } from "../utils/token.js";
-
-import { generateApplication } from "../config/agentConfig.js";
+import { requireGeminiApiKey } from "../../lib/orbitalConfig.js";
 
 marked.use(markedTerminal());
 
-let aiService;
-const chatService = new ChatService();
-
 const getEnabledToolNames = () => {
   return [];
 };
@@ -27,39 +28,30 @@ 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 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");
 
@@ -90,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) => {
@@ -154,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), {
@@ -210,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") +