maverick-ai-cli 3.0.2 → 3.0.3

package/README.md

@@ -1,64 +1,73 @@
 # Maverick AI CLI
 
-Maverick is an intelligent command-line interface powered by AI, designed to be your coding companion directly in your terminal. It features a robust backend integration, secure authentication, and a powerful chat interface.
+An intelligent command-line interface powered by AI — your coding companion directly in your terminal. Authenticate via GitHub, chat with Gemini AI, and get intelligent responses with markdown rendering.
 
 ## Installation
 
-You can install Maverick globally using npm:
+Install globally:
 
 ```bash
 npm install -g maverick-ai-cli
 ```
 
-## Usage
+Or run directly with `npx`:
 
-Once installed, you can use the `maverick` command to interact with the CLI.
+```bash
+npx maverick-ai-cli <command>
+```
+
+> **Prerequisites:** Node.js 18+ is required.
 
-### Authentication
+## Commands
 
-Before using the AI features, you need to authenticate.
+### `login` — Authenticate via GitHub
 
 ```bash
 maverick login
 ```
-This will open a browser window for you to sign in with your GitHub account.
 
-To check your current login status:
+Opens a browser for GitHub OAuth device flow authentication. Your credentials are stored locally at `~/.better-auth/token.json`.
+
+### `whoami` — Check current user
+
 ```bash
 maverick whoami
 ```
 
-To logout:
+### `logout` — Sign out
+
 ```bash
 maverick logout
 ```
 
-### AI Companion
-
-To start a chat session with Maverick:
+### `wakeup` — Start AI session
 
 ```bash
 maverick wakeup
 ```
 
-This will enter an interactive mode where you can:
-- **Chat**: Have a conversation with the AI.
-- **Tools**: (Coming soon) Execute tools and perform actions.
-- **Agent**: (Coming soon) Autonomous agent capabilities.
+Select a mode:
+- **Chat** — Conversational AI with markdown rendering
+- **Tool Calling** — AI with Google Search & code execution *(coming soon)*
+- **Agent** — Autonomous AI agent *(coming soon)*
 
-Supported features in chat:
-- Markdown rendering in terminal.
-- Context-aware conversations.
-- Persistent session history.
+### Chat Features
+
+- Markdown rendering in terminal
+- Context-aware conversations
+- Persistent session history
+- Streaming AI responses
 
 ## Development
 
-If you want to contribute or run the server locally:
+### Server Setup
+
+The backend server powers authentication and data storage. It's deployed at `https://maverick-cli.onrender.com`.
 
 1. **Clone the repository:**
    ```bash
    git clone https://github.com/CodeMaverick-143/maverick-cli.git
-   cd CLI/server
+   cd maverick-cli/server
    ```
 
 2. **Install dependencies:**
@@ -66,18 +75,20 @@ If you want to contribute or run the server locally:
    npm install
    ```
 
-3. **Set up Environment Variables:**
-   Create a `.env` file in the `server` directory with the following:
+3. **Environment Variables:**
+   Create a `.env` file in the `server` directory:
    ```env
    DATABASE_URL="postgresql://..."
-   GITHUB_CLIENT_ID="your_client_id"
-   GITHUB_CLIENT_SECRET="your_client_secret"
-   BETTER_AUTH_SECRET="your_auth_secret"
-   BETTER_AUTH_URL="https://maverick-cli.onrender.com"
-   GOOGLE_API_KEY="your_gemini_api_key"
+   GITHUB_CLIENT_ID="your_github_oauth_app_client_id"
+   GITHUB_CLIENT_SECRET="your_github_oauth_app_client_secret"
+   BETTER_AUTH_SECRET="your_random_auth_secret"
+   BETTER_AUTH_URL="http://localhost:3005"
+   GOOGLE_GENERATIVE_AI_API_KEY="your_gemini_api_key"
+   ORBITAL_MODEL="gemini-2.5-flash"
+   PORT=3005
    ```
 
-4. **Run Database Migrations:**
+4. **Database Setup:**
    ```bash
    npx prisma generate
    npx prisma migrate dev
@@ -88,5 +99,57 @@ If you want to contribute or run the server locally:
    npm run dev
    ```
 
-## Licenses
+### Architecture
+
+```
+server/
+├── src/
+│   ├── index.js              # Express server + API endpoints
+│   ├── cli/
+│   │   ├── main.js            # CLI entry point (Commander.js)
+│   │   ├── commands/
+│   │   │   ├── auth/login.js  # login, logout, whoami
+│   │   │   └── ai/wakeUp.js   # wakeup command
+│   │   ├── chat/
+│   │   │   └── chat-with-ai.js # AI chat loop
+│   │   └── ai/
+│   │       └── google-service.js # Gemini AI SDK
+│   ├── lib/
+│   │   ├── api-client.js      # CLI → Server HTTP client
+│   │   ├── auth.js            # Better Auth config (server)
+│   │   ├── db.js              # Prisma client (server)
+│   │   └── token.js           # Token storage (~/.better-auth/)
+│   ├── config/
+│   │   ├── google.config.js   # AI model config
+│   │   └── tool.config.js     # Tool definitions
+│   └── service/
+│       └── chat.service.js    # Chat DB service (server)
+└── prisma/
+    └── schema.prisma          # Database schema
+```
+
+### API Endpoints
+
+| Endpoint | Method | Description |
+|---|---|---|
+| `/api/auth/*` | ALL | Better Auth routes |
+| `/api/me` | GET | Get current session |
+| `/api/cli/user` | GET | Get user from Bearer token |
+| `/api/cli/conversations` | POST | Create conversation |
+| `/api/cli/conversations/:id` | GET | Get conversation + messages |
+| `/api/cli/conversations/:id/title` | PUT | Update title |
+| `/api/cli/conversations/:id/messages` | GET | List messages |
+| `/api/cli/conversations/:id/messages` | POST | Create message |
+
+## Tech Stack
+
+- **Runtime:** Node.js
+- **AI:** Google Gemini via Vercel AI SDK
+- **Auth:** Better Auth (GitHub OAuth + Device Flow)
+- **Database:** PostgreSQL + Prisma ORM
+- **Server:** Express 5
+- **CLI:** Commander.js, Clack prompts, Chalk
+
+## License
+
 ISC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maverick-ai-cli",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -9,8 +9,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node src/index.js",
-    "dev": "nodemon src/index.js",
-    "postinstall": "prisma generate"
+    "dev": "nodemon src/index.js"
   },
   "keywords": [],
   "author": "CodeMaverick-143 AKA Arpit Sarang",

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

@@ -5,10 +5,7 @@ import yoctoSpinner from "yocto-spinner";
 import { marked } from "marked";
 import { markedTerminal } from "marked-terminal"
 import { AIService } from "../ai/google-service.js";
-import { ChatService } from "../../service/chat.service.js";
-import { getStoredToken } from "../../lib/token.js"
-import prisma from "../../lib/db.js";
-import { yo } from "zod/v4/locales";
+import { apiClient } from "../../lib/api-client.js";
 
 marked.use(
     markedTerminal({
@@ -31,41 +28,36 @@ marked.use(
 
 
 const aiService = new AIService();
-const chatService = new ChatService();
 
 
 async function getUserFromToken() {
-    const token = await getStoredToken()
-    if (!token?.access_token) {
-        throw new Error("Not authenticated. Please run 'maverick login' first.")
-    }
     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 user = await apiClient.getUser();
+        spinner.success(`Welcome back, ${user.name}!`)
+        return user;
+    } catch (err) {
+        spinner.error("Authentication failed");
+        throw err;
     }
-
-    spinner.success(`Welcome back, ${user.name}!`)
-    return user;
 }
 
 
 async function initConversation(userId, conversationId = null, mode = "chat") {
     const spinner = yoctoSpinner({ text: "Loading conversation...." }).start()
 
-    const conversation = await chatService.getOrCreateConversation(
-        userId,
-        conversationId,
-        mode
-    )
+    let conversation;
+    if (conversationId) {
+        try {
+            conversation = await apiClient.getConversation(conversationId);
+        } catch {
+            // conversation not found, create new one
+        }
+    }
+
+    if (!conversation) {
+        conversation = await apiClient.createConversation(mode);
+    }
 
     spinner.success("Conversation Loaded")
 
@@ -83,7 +75,7 @@ async function initConversation(userId, conversationId = null, mode = "chat") {
 
     console.log(conversationInfo)
 
-    if (conversation.message?.length > 0) {
+    if (conversation.messages?.length > 0) {
         console.log(chalk.yellow(" Previous messages: \n"));
         displayMessages(conversation.messages);
     }
@@ -121,16 +113,18 @@ function displayMessages(messages) {
 
 
 async function saveMessage(conversationId, role, content) {
-    const message = await chatService.createMessage(conversationId, role, content)
-    return message
+    return await apiClient.createMessage(conversationId, role, content);
 }
 
 
 
 async function getAIResponse(conversationId) {
     const spinner = yoctoSpinner({ text: "Thinking...", color: "yellow" }).start();
-    const dbMessages = await chatService.getMessages(conversationId)
-    const aiMessages = chatService.formatMessagesForAI(dbMessages)
+    const dbMessages = await apiClient.getMessages(conversationId);
+    const aiMessages = dbMessages.map(msg => ({
+        role: msg.role,
+        content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content)
+    }));
 
     let fullResponse = ""
 
@@ -175,7 +169,7 @@ async function updateConversationTitle(conversationId, userInput, messageCount)
     if (messageCount === 1) {
         const spinner = yoctoSpinner({ text: "Updating conversation title...." }).start();
         const title = userInput.slice(0, 50) + (userInput.length > 50 ? "..." : "");
-        await chatService.updateConversationTitle(conversationId, title)
+        await apiClient.updateTitle(conversationId, title);
         spinner.success("Conversation title updated")
     }
 }
@@ -236,13 +230,13 @@ const chatLoop = async (conversation) => {
 
             await saveMessage(conversation.id, "user", userInput)
 
-            const message = await chatService.getMessages(conversation.id)
+            const messages = await apiClient.getMessages(conversation.id)
 
             const aiResponse = await getAIResponse(conversation.id)
 
             await saveMessage(conversation.id, "assistant", aiResponse)
 
-            await updateConversationTitle(conversation.id, userInput, message.length)
+            await updateConversationTitle(conversation.id, userInput, messages.length)
 
         }
 
@@ -289,5 +283,3 @@ export async function startChat(mode = "chat", conversationId = null) {
 
     }
 }
-
-

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

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import { Command } from "commander";
 import yoctoSpinner from "yocto-spinner"
 import { requireAuth } from "../../../lib/token.js";
-import prisma from "../../../lib/db.js";
+import { apiClient } from "../../../lib/api-client.js";
 import { select } from "@clack/prompts";
 import { startChat } from "../../chat/chat-with-ai.js";
 
@@ -13,22 +13,7 @@ const wakeUpAction = async () => {
     spinner.start()
 
 
-    const user = await prisma.user.findFirst({
-        where: {
-            sessions: {
-                some: {
-                    token: token.access_token
-                }
-            }
-        },
-        select: {
-            id: true,
-            name: true,
-            email: true,
-            image: true
-        }
-
-    });
+    const user = await apiClient.getUser();
 
     spinner.stop()
 

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

@@ -14,7 +14,7 @@ import yoctoSpinner from "yocto-spinner";
 import * as z from "zod";
 import dotenv from "dotenv";
 import { clearStoredToken, getStoredToken, isTokenExpired, requireAuth, storeToken } from "../../../lib/token.js";
-import prisma from "../../../lib/db.js";
+import { apiClient } from "../../../lib/api-client.js";
 
 dotenv.config();
 
@@ -250,21 +250,7 @@ export async function whoamiAction(opts) {
     process.exit(1)
   }
 
-  const user = await prisma.user.findFirst({
-    where: {
-      sessions: {
-        some: {
-          token: token.access_token,
-        }
-      }
-    },
-    select: {
-      id: true,
-      name: true,
-      email: true,
-      image: true
-    },
-  })
+  const user = await apiClient.getUser();
 
   console.log(
     chalk.bold.greenBright(`\n USER: ${user.name}

package/src/index.js

@@ -44,6 +44,135 @@ app.get('/health', (req, res) => {
     res.send("Backend is running")
 })
 
+
+async function authenticateToken(req, res, next) {
+    const authHeader = req.headers.authorization;
+    const token = authHeader?.startsWith("Bearer ") ? authHeader.slice(7) : null;
+
+    if (!token) {
+        return res.status(401).json({ error: "Missing authorization token" });
+    }
+
+    try {
+        const { default: prisma } = await import("./lib/db.js");
+        const user = await prisma.user.findFirst({
+            where: {
+                sessions: {
+                    some: { token }
+                }
+            },
+            select: { id: true, name: true, email: true, image: true }
+        });
+
+        if (!user) {
+            return res.status(401).json({ error: "Invalid or expired token" });
+        }
+
+        req.user = user;
+        next();
+    } catch (err) {
+        console.error("Auth middleware error:", err.message);
+        return res.status(500).json({ error: "Authentication failed" });
+    }
+}
+
+// GET /api/cli/user — get current user from token
+app.get("/api/cli/user", authenticateToken, (req, res) => {
+    res.json(req.user);
+});
+
+// POST /api/cli/conversations — create a conversation
+app.post("/api/cli/conversations", authenticateToken, async (req, res) => {
+    try {
+        const { default: prisma } = await import("./lib/db.js");
+        const { mode = "chat", title } = req.body || {};
+        const conversation = await prisma.conversation.create({
+            data: {
+                userId: req.user.id,
+                mode,
+                title: title || `New ${mode} conversation`
+            }
+        });
+        res.json(conversation);
+    } catch (err) {
+        console.error("Create conversation error:", err.message);
+        res.status(500).json({ error: "Failed to create conversation" });
+    }
+});
+
+// GET /api/cli/conversations/:id — get a conversation with messages
+app.get("/api/cli/conversations/:id", authenticateToken, async (req, res) => {
+    try {
+        const { default: prisma } = await import("./lib/db.js");
+        const conversation = await prisma.conversation.findFirst({
+            where: { id: req.params.id, userId: req.user.id },
+            include: {
+                messages: { orderBy: { createdAt: "asc" } }
+            }
+        });
+
+        if (!conversation) {
+            return res.status(404).json({ error: "Conversation not found" });
+        }
+
+        res.json(conversation);
+    } catch (err) {
+        console.error("Get conversation error:", err.message);
+        res.status(500).json({ error: "Failed to get conversation" });
+    }
+});
+
+// PUT /api/cli/conversations/:id/title — update conversation title
+app.put("/api/cli/conversations/:id/title", authenticateToken, async (req, res) => {
+    try {
+        const { default: prisma } = await import("./lib/db.js");
+        const { title } = req.body;
+        const conversation = await prisma.conversation.update({
+            where: { id: req.params.id },
+            data: { title }
+        });
+        res.json(conversation);
+    } catch (err) {
+        console.error("Update title error:", err.message);
+        res.status(500).json({ error: "Failed to update title" });
+    }
+});
+
+// GET /api/cli/conversations/:id/messages — get messages
+app.get("/api/cli/conversations/:id/messages", authenticateToken, async (req, res) => {
+    try {
+        const { default: prisma } = await import("./lib/db.js");
+        const messages = await prisma.message.findMany({
+            where: { conversationId: req.params.id },
+            orderBy: { createdAt: "asc" }
+        });
+        res.json(messages);
+    } catch (err) {
+        console.error("Get messages error:", err.message);
+        res.status(500).json({ error: "Failed to get messages" });
+    }
+});
+
+// POST /api/cli/conversations/:id/messages — create a message
+app.post("/api/cli/conversations/:id/messages", authenticateToken, async (req, res) => {
+    try {
+        const { default: prisma } = await import("./lib/db.js");
+        const { role, content } = req.body;
+        const contentStr = typeof content === "string" ? content : JSON.stringify(content);
+        const message = await prisma.message.create({
+            data: {
+                conversationId: req.params.id,
+                role,
+                content: contentStr
+            }
+        });
+        res.json(message);
+    } catch (err) {
+        console.error("Create message error:", err.message);
+        res.status(500).json({ error: "Failed to create message" });
+    }
+});
+
 app.listen(process.env.PORT, () => {
     console.log(`running on PORT : http://localhost:${process.env.PORT}`)
 })

package/src/lib/api-client.js

@@ -0,0 +1,63 @@
+import { getStoredToken } from "./token.js";
+
+const BASE_URL = "https://maverick-cli.onrender.com";
+
+async function getAuthHeaders() {
+    const token = await getStoredToken();
+    if (!token?.access_token) {
+        throw new Error("Not authenticated. Please run 'maverick login' first.");
+    }
+    return {
+        "Authorization": `Bearer ${token.access_token}`,
+        "Content-Type": "application/json"
+    };
+}
+
+async function request(method, path, body = null) {
+    const headers = await getAuthHeaders();
+    const options = { method, headers };
+    if (body) {
+        options.body = JSON.stringify(body);
+    }
+
+    const res = await fetch(`${BASE_URL}${path}`, options);
+
+    if (!res.ok) {
+        const err = await res.json().catch(() => ({ error: res.statusText }));
+        throw new Error(err.error || `API error: ${res.status}`);
+    }
+
+    return res.json();
+}
+
+export const apiClient = {
+    /** Get current user from token */
+    async getUser() {
+        return request("GET", "/api/cli/user");
+    },
+
+    /** Create a new conversation */
+    async createConversation(mode = "chat", title = null) {
+        return request("POST", "/api/cli/conversations", { mode, title });
+    },
+
+    /** Get a conversation by ID (with messages) */
+    async getConversation(conversationId) {
+        return request("GET", `/api/cli/conversations/${conversationId}`);
+    },
+
+    /** Update conversation title */
+    async updateTitle(conversationId, title) {
+        return request("PUT", `/api/cli/conversations/${conversationId}/title`, { title });
+    },
+
+    /** Get messages for a conversation */
+    async getMessages(conversationId) {
+        return request("GET", `/api/cli/conversations/${conversationId}/messages`);
+    },
+
+    /** Create a message in a conversation */
+    async createMessage(conversationId, role, content) {
+        return request("POST", `/api/cli/conversations/${conversationId}/messages`, { role, content });
+    }
+};