Merge branch 'main' of https://github.com/codeboltai/codeboltjs

Author: utkarshx

src/agentlib/promptbuilder.ts

@@ -1,7 +1,7 @@
 import { UserMessage } from "./usermessage";
 import { SystemPrompt } from "./systemprompt";
 import { TaskInstruction } from "./taskInstruction";
-import { UserMessage as CLIUserMessage } from "../types/cliWebSocketInterfaces";
+import { UserMessage as CLIUserMessage } from "../types/socketMessageTypes";
 import yaml from 'js-yaml';
 import fs from 'fs';
 import path from 'path';

src/index.ts

@@ -25,78 +25,22 @@ import {chatSummary} from './modules/history'
 import codeboltTools from './modules/mcp';
 import cbagent from './modules/agent';
 import cbutils from './modules/utils';
-import type { ChatMessageFromUser, LLMResponse, UserMessage } from './types/cliWebSocketInterfaces';
+import type { ChatMessageFromUser, LLMResponse, UserMessage } from './types/socketMessageTypes';
 import { userInfo } from 'os';
 
-/**
- * Represents a message in the conversation with roles and content.
- */
-export interface Message {
-    /** The role of the message sender: user, assistant, tool, or system */
-    role: 'user' | 'assistant' | 'tool' | 'system';
-    /** The content of the message, can be an array of content blocks or a string */
-    content: any[] | string;
-    /** Optional ID for tool calls */
-    tool_call_id?: string;
-    /** Optional tool calls for assistant messages */
-    tool_calls?: ToolCall[];
-    /** Additional properties that might be present */
-    [key: string]: any;
-}
-
-/**
- * Represents a tool call in OpenAI format
- */
-export interface ToolCall {
-    /** Unique identifier for this tool call */
-    id: string;
-    /** The type of tool call */
-    type: 'function';
-    /** Function call details */
-    function: {
-        /** Name of the function to call */
-        name: string;
-        /** Arguments for the function call as JSON string */
-        arguments: string;
-    };
-}
-
-/**
- * Represents a tool definition in OpenAI format
- */
-export interface Tool {
-    /** The type of tool */
-    type: 'function';
-    /** Function definition */
-    function: {
-        /** Name of the function */
-        name: string;
-        /** Description of what the function does */
-        description?: string;
-        /** JSON schema for the function parameters */
-        parameters?: any;
-    };
-}
-
-/**
- * LLM inference request parameters
- */
-export interface LLMInferenceParams {
-    /** Array of messages in the conversation */
-    messages: Message[];
-    /** Available tools for the model to use */
-    tools?: Tool[];
-    /** How the model should use tools */
-    tool_choice?: 'auto' | 'none' | 'required' | { type: 'function'; function: { name: string } };
-    /** The LLM role to determine which model to use */
-    llmrole: string;
-    /** Maximum number of tokens to generate */
-    max_tokens?: number;
-    /** Temperature for response generation */
-    temperature?: number;
-    /** Whether to stream the response */
-    stream?: boolean;
-}
+// Re-export public API types for user convenience
+export type { 
+    Message, 
+    ToolCall, 
+    Tool, 
+    LLMInferenceParams,
+    APIResponse,
+    CodeboltConfig,
+    ProgressCallback,
+    ErrorCallback,
+    SuccessCallback,
+    CompletionCallback
+} from './types/libFunctionTypes';
 
 /**
  * @class Codebolt

src/modules/agent.ts

@@ -1,4 +1,4 @@
-import { GetAgentStateResponse, FindAgentByTaskResponse, ListAgentsResponse, AgentsDetailResponse, TaskCompletionResponse } from '../types/cliWebSocketInterfaces';
+import { GetAgentStateResponse, FindAgentByTaskResponse, ListAgentsResponse, AgentsDetailResponse, TaskCompletionResponse } from '../types/socketMessageTypes';
 import cbws from '../core/websocket';
 
 

src/modules/browser.ts

@@ -1,5 +1,5 @@
 import cbws from '../core/websocket';
-import { GoToPageResponse, UrlResponse, GetMarkdownResponse, HtmlReceived, ExtractTextResponse, GetContentResponse, BrowserActionResponseData, BrowserScreenshotResponse, BrowserInfoResponse, BrowserSnapshotResponse } from '../types/cliWebSocketInterfaces';
+import { GoToPageResponse, UrlResponse, GetMarkdownResponse, HtmlReceived, ExtractTextResponse, GetContentResponse, BrowserActionResponseData, BrowserScreenshotResponse, BrowserInfoResponse, BrowserSnapshotResponse } from '../types/socketMessageTypes';
 /**
  * A module for interacting with a browser through WebSockets.
  */

src/modules/chat.ts

@@ -1,6 +1,6 @@
 // chat.ts
 import cbws from '../core/websocket';
-import { ChatMessage, UserMessage } from '../types/cliWebSocketInterfaces';
+import { ChatMessage, UserMessage } from '../types/socketMessageTypes';
 
 type RequestHandler = (request: any, response: (data: any) => void) => Promise<void> | void;
 /**

src/modules/codeutils.ts

@@ -5,28 +5,12 @@ import path from 'path';
 // import JavaScript from 'tree-sitter-javascript';
 // import typescript from "tree-sitter-typescript"; // TypeScript and TSX grammar
 
-import { MatchProblemResponse, GetMatcherListTreeResponse, getMatchDetail } from '../types/cliWebSocketInterfaces';
+import { MatchProblemResponse, GetMatcherListTreeResponse, getMatchDetail } from '../types/socketMessageTypes';
 import { loadRequiredLanguageParsers } from '../utils/parse-source-code/languageParser';
 
-// Define our own interface for the JS tree response
-export interface JSTreeStructureItem {
-    type: string;
-    name: string;
-    startLine: number;
-    endLine: number;
-    startColumn: number;
-    endColumn: number;
-    nodeType: string;
-}
-
-export interface JSTreeResponse {
-    event: string;
-    payload?: {
-        filePath: string;
-        structure: JSTreeStructureItem[];
-    };
-    error?: string;
-}
+// Import and re-export types from InternalTypes for consistency
+import type { JSTreeStructureItem, JSTreeResponse } from '../types/InternalTypes';
+export type { JSTreeStructureItem, JSTreeResponse };
 
 /**
  * A utility module for working with code.

src/modules/dbmemory.ts

@@ -1,5 +1,5 @@
 import cbws from '../core/websocket';
-import { MemorySetResponse, MemoryGetResponse } from '../types/cliWebSocketInterfaces';
+import { MemorySetResponse, MemoryGetResponse } from '../types/socketMessageTypes';
 
 /**
  * A module for handling in-memory database operations via WebSocket.

src/modules/debug.ts

@@ -1,5 +1,5 @@
 import cbws from '../core/websocket';
-import { DebugAddLogResponse, OpenDebugBrowserResponse } from '../types/cliWebSocketInterfaces';
+import { DebugAddLogResponse, OpenDebugBrowserResponse } from '../types/socketMessageTypes';
 export enum logType{
     info="info",
     error="error",

src/modules/fs.ts

@@ -1,5 +1,5 @@
 import cbws from '../core/websocket';
-import { CreateFileResponse, CreateFolderResponse, ReadFileResponse, UpdateFileResponse, DeleteFileResponse, DeleteFolderResponse } from '../types/cliWebSocketInterfaces';
+import { CreateFileResponse, CreateFolderResponse, ReadFileResponse, UpdateFileResponse, DeleteFileResponse, DeleteFolderResponse } from '../types/socketMessageTypes';
 /**
  * @module cbfs
  * @description This module provides functionality to interact with the filesystem.

src/modules/history.ts

@@ -1,8 +1,10 @@
 import cbws from '../core/websocket';
-import { GetSummarizeAllResponse, GetSummarizeResponse } from '../types/cliWebSocketInterfaces';
+import { GetSummarizeAllResponse, GetSummarizeResponse } from '../types/socketMessageTypes';
+import { LogType } from '../types/commonTypes';
 
 /**
  * Enum representing different types of log messages.
+ * @deprecated Use LogType from commonTypes instead
  */
 export enum logType {
     /** Informational messages */
@@ -13,6 +15,9 @@ export enum logType {
     warning = "warning"
 }
 
+// Re-export the new LogType for consistency
+export { LogType };
+
 /**
  * Object with methods for summarizing chat history.
  * Provides functionality to create summaries of conversation history.