@j-o-r/hello-dave 0.0.2 → 0.0.4

package/lib/AgentManager.js

@@ -2,14 +2,15 @@ import { Prompt, Cli, AgentClient, AgentServer, API, ToolSet, Session, env } fro
 import toolsPool from './genericToolset.js'
 /**
 * @typedef {import('./API/x.ai/text.js').XOptions} XOptions
+* @typedef {import('./API/x.ai/responses.js').XAIOptions} XAIOptions
 * @typedef {import('./API/openai.com/reponses/text.js').OAOptions} OAOptions
 * @typedef {import('./API/anthropic.com/text.js').ANTHOptions} ANTHOptions
 */
 /**
 * @typedef {Object} Setup
 * @property {string} prompt - Initial system prompt
-* @property {OAOptions|XOptions|ANTHOptions} options - Model options
-* @property {'gpt'|'grok'|'claude'} api - AI endpoint to use
+* @property {XAIOptions|OAOptions|XOptions|ANTHOptions} options - Model options
+* @property {'gpt'|'xai'|'claude'} api - AI endpoint to use
 * @property {number} [contextWindow] - The size in tokens for the context/session
 * @property {'auto'|'required'|void} [toolsetMode] - 
 * @property {boolean} [debug] - verbose output
@@ -17,6 +18,7 @@ import toolsPool from './genericToolset.js'
 /**
 * @typedef {Object} Options
 * @property {string} name - Agent name
+* @property {string} secret - Secret string for WS access authorisation (server and client secrets should match)
 * @property {string} [cachePath] - path to session/record storage 
 */
 class AgentManager {
@@ -25,13 +27,24 @@ class AgentManager {
   /** @type {Session} */
   #sessionStorage;
   #name = 'agent';
+  #secret = '';
   #cachePath = '.cache/hello-dave';
   #debug = false;
+  #model = '';
+  #contextWindow = 0;
+  #sysPrompt = '';
   /**
   * @param {Options} options
   */
   constructor(options) {
     this.#name = options.name || this.#name;
+    if (options.secret && typeof options.secret === 'string') {
+      this.#secret = Buffer.from(options.secret).toString('base64');
+    } 
+    const validNameRegex = /^[a-z_0-9]{2,}$/;
+    if (!validNameRegex.test(this.#name)) {
+      throw new Error(`Invalid agent 'name' in options: '${this.#name}'. Must match /^[a-z_0-9]{2,}$/ (lowercase a-z, digits, underscores; min 2 chars).`);
+    }
     this.#cachePath = options.cachePath || this.#cachePath;
   }
 
@@ -47,6 +60,12 @@ class AgentManager {
     	toolsetMode = null,
     	debug = false
     } = setup;
+    this.#sysPrompt = prompt;
+    this.#contextWindow = contextWindow;
+    if (options?.model) this.#model = options.model;
+    this.#sysPrompt = prompt;
+    this.#contextWindow = contextWindow;
+    if (options?.model) this.#model = options.model;
     let toolset;
     if (toolsetMode) {
     	toolset = new ToolSet(toolsetMode);
@@ -65,7 +84,7 @@ class AgentManager {
   * Start a CLI for local usage
   * @param {string} description - introduction message for the CLI user
   */
-  startCli(description) {
+  #startCli(description) {
     if (!this.#prompt) throw new Error('Run setup first');
     const cli = new Cli({ prompt: this.#prompt, session: this.#sessionStorage, description });
     setTimeout(() => {
@@ -82,9 +101,9 @@ class AgentManager {
   * @param {string} description - function_call description
   * @param {string} [url='ws://127.0.0.1:8000/ws'] - ws URL
   */
-  attach(name, description, url = 'ws://127.0.0.1:8000/ws') {
+  #attach(name, description, url = 'ws://127.0.0.1:8000/ws') {
     if (!this.#prompt) throw new Error('Run setup first');
-    return new AgentClient({ prompt: this.#prompt, name, description, url });
+    return new AgentClient({ prompt: this.#prompt, name, description, url, secret: this.#secret });
   }
 
   /**
@@ -95,12 +114,13 @@ class AgentManager {
   * @param {string} description - function_call description
   * @param {number} [port=8000] - Start the dynamic toolset server on this port
   */
-  enableServer(name, description = '', port = 8000) {
+  #enableServer(name, description = '', port = 8000) {
     if (!this.#prompt) throw new Error('Run setup first');
     if (!this.#prompt.toolset) throw new Error('No toolset defined');
     const server = new AgentServer({
     	port,
     	name,
+    	secret: this.#secret,
     	description,
     	prompt: this.#prompt,
     	session: this.#sessionStorage,
@@ -131,13 +151,63 @@ class AgentManager {
   	return env();
   }
   /**
-  * @param {string} name - the toolname
-  */
+   * Adds a pre-defined generic tool from lib/genericToolset.js to this agent's ToolSet.
+   * @param {'execute_bash_script'|'execute_remote_script'|'get_user_env'|'history_search'|'javascript_interpreter'|'memory_recall'|'memory_write'|'open_link'|'read_file'|'send_email'|'syntax_check'|'write_file'} name - Valid generic tool name (validated /^[a-z_0-9]{2,}$/).
+   * @throws {Error} If toolset not initialized or tool not found in pool.
+   */
   addGenericToolcall(name) {
+    const validNameRegex = /^[a-z_0-9]{2,}$/;
+    if (!validNameRegex.test(name)) {
+      throw new Error(`Invalid 'name': '${name}'. Must match /^[a-z_0-9]{2,}$/ (lowercase a-z, digits, underscores; min 2 chars).`);
+    }
     if (!this.#prompt.toolset) throw new Error('No ToolSet defined')
-    let tool  = toolsPool.get(name);
+    let tool = toolsPool.get(name);
     if (!tool) throw new Error('Tool not defined')
-  	this.#prompt.toolset.add(name, tool.description, tool.parameters, tool.method);
+    this.#prompt.toolset.add(name, tool.description, tool.parameters, tool.method);
+  }
+  
+  /**
+   * Smart launcher: Dispatches to CLI/server/attach/direct. Auto-gens cliIntro/desc if empty.
+   * @param {number} [servePort] - Server port (if no input).
+   * @param {string} [connectUrl] - WS to attach. e.g. ws://127.0.0.1:8091/ws
+   * @param {string} [cliIntro=""] - CLI intro (auto-gen if falsy).
+   * @param {string} [toolName=""] - name /^[a-z_0-9]{2,}$/ Tool name for server/attach (defaults to agent.name).
+   * @param {string} [toolDescription=""] - Tool desc (auto-gen if falsy).
+   */
+  async start(servePort, connectUrl, cliIntro = "", toolName = "", toolDescription = "") {
+    if (!this.#prompt) throw new Error("Run setup first");
+
+    const validNameRegex = /^[a-z_0-9]{2,}$/;
+
+    toolName = toolName || this.#name;
+    // Validate 'toolName' (or fallback agent name)
+    if (!validNameRegex.test(toolName)) {
+      throw new Error(`Invalid 'toolName' (or agent #name): '${toolName}'. Must match /^[a-z_0-9]{2,}$/ (lowercase a-z, digits, underscores; min 2 chars).`);
+    }
+
+    if (!toolDescription && this.#sysPrompt) {
+      toolDescription = this.#sysPrompt.slice(0, 100).trim() + "...";
+    }
+
+    if (!cliIntro) {
+      const introStr = this.#name + " " + (this.#model || "unknown-model") + " - context: " + this.#contextWindow;
+      cliIntro = introStr.trim();
+    }
+    if (servePort) {
+      console.log(toolName);
+      console.log(toolDescription);
+      this.#enableServer(toolName, toolDescription, servePort);
+      // A server can also be a client
+      if (connectUrl) {
+        this.#attach(toolName, toolDescription, connectUrl);
+      }
+    } else if (connectUrl) {
+      // Connect to a agent 'server' and enable via websocket / toolcalls
+      this.#attach(toolName, toolDescription, connectUrl);
+    } else {
+      // Terminal user CLI
+      this.#startCli(cliIntro);
+    }
   }
 }
 

package/lib/AgentServer.js

@@ -19,11 +19,12 @@ let ws;
 * @property {messageContent} content
 */
 /**
-* @typedef {(conn: import('@j-o-r/apiserver/types/WebSocketServer.js').WebSocketConnection) => Promise<boolean>} AuthFunction
+* @typedef {(conn: import('@j-o-r/apiserver/types/WebSocketServer.js').WebSocketConnection, req: any) => Promise<boolean>} AuthFunction
 */
 /**
 * @typedef {Object} AgentServerOptions
 * @property {string} name
+* @property {string} secret - server access secret
 * @property {string} description
 * @property {Prompt} prompt
 * @property {Session} session
@@ -32,7 +33,7 @@ let ws;
 * @property {boolean} [debug = false] 
 */
 
- const ACTIONS = [
+const ACTIONS = [
 	// Agent / Toolset function calls
 	'agent_introduction', // Describe your task, your purpose and usage. This is a reaction on a 'introduce' requests
 	'agent_error',        // Message error
@@ -42,6 +43,7 @@ let ws;
 	'user_introduction',  // Websocket client connection on open
 	'user_request',       // A client user request
 	'server_response',    // A reponse to a user request
+	'server_error',    // A reponse to a user request
 	'user_reset',         // User requests a new session
 	'user_sessionlist',   // Request a list of sessions
 	'user_loadsession',   // Request to load a session
@@ -129,6 +131,7 @@ class AgentServer {
 	#debug = false;
 	#port = 8000;
 	#name = '';
+	#secret = ''; // access secret
 	#description = '';
 	/** @type {Prompt} */
 	#prompt
@@ -136,7 +139,9 @@ class AgentServer {
 	#session
 	/** @type {AuthFunction} */
 	#auth = async (conn) => {
-		return true;
+		const q = conn.client.query;
+		const key = q.get('wssrc_id');
+		return key === this.#secret;
 	}
 	/**
 	* @param {AgentServerOptions} options
@@ -152,16 +157,25 @@ class AgentServer {
 			this.#auth = options.auth;
 		}
 		this.#name = options.name;
+		this.#secret = options.secret;
 		this.#description = options.description;
 		this.#session = options.session;
 		this.#prompt = options.prompt;
+		this.#debug = options.debug;
+		// LOG EVENTS
 		const events = Object.keys(this.#prompt.EVENTS);
 		events.forEach((evt) => {
 			this.#prompt.on(evt, (_msg) => {
-				console.log(evt);
+				// log events
+				console.log(`** ${this.#name} e:${evt}**`);
+				if (evt === 'tool_request') {
+					console.log(`tool execute: ${this.#name} ${_msg.name} ${_msg.call_id}`);
+				} else if (evt === 'tool_error') {
+					console.log(`tool error:`);
+					console.log(JSON.stringify(_msg, null, '  '));
+				}
 			});
 		});
-		this.#debug = options.debug;
 		// start 
 		(async () => {
 			await this._start();
@@ -213,8 +227,8 @@ class AgentServer {
 					const key = `${conn.id}:${msg.id}`; // Assume client includes original 'id' in response
 					const pending = pendingResponses.get(key);
 					if (pending) {
-            try { clearInterval(pending.timer); } catch {}
-            pending.resolve(msg.content);
+						try { clearInterval(pending.timer); } catch { }
+						pending.resolve(msg.content);
 						pendingResponses.delete(key);
 					}
 					return;
@@ -223,8 +237,8 @@ class AgentServer {
 					const key = `${conn.id}:${msg.id}`; // Assume client includes original 'id' in response
 					const pending = pendingResponses.get(key);
 					if (pending) {
-            try { clearInterval(pending.timer); } catch {}
-            pending.reject(msg.content);
+						try { clearInterval(pending.timer); } catch { }
+						pending.reject(msg.content);
 						pendingResponses.delete(key);
 					}
 					return;
@@ -245,13 +259,23 @@ class AgentServer {
 					}
 					// Bind to THIS prompt
 					console.log(`user_request:>>\n${msg.content}\n`);
-					const content = await this.#prompt.call(msg.content);
-					ws.sendToConnection(conn.id, JSON.stringify({
-						action: 'server_response',
-						id,
-						content
-					}));
-					console.log(`server_reponse:>>\n${content}\n`);
+					try {
+						const content = await this.#prompt.call(msg.content);
+						ws.sendToConnection(conn.id, JSON.stringify({
+							action: 'server_response',
+							id,
+							content
+						}));
+						console.log(`server_reponse:>>\n${content}\n`);
+					} catch (e) {
+						console.log(`server_error:>>\n`);
+						console.error(e);
+						ws.sendToConnection(conn.id, JSON.stringify({
+							action: 'server_error',
+							id,
+							e
+						}));
+					}
 				}
 				if (msg.action === 'user_reset') {
 					const id = msg.id;
@@ -278,18 +302,22 @@ class AgentServer {
 					const selected = msg.content;
 					const messages = [];
 					const list = this.#session.set(selected);
-					list.forEach((msg) => {
+					this.#prompt.messages = list;
+					let i = 0;
+					const length = list.length;
+					for (; i < length; i++) {
+						const msg = list[i];
 						if (!msg.sticky) {
 							if (['user', 'assistant', 'reasoning', 'log'].includes(msg.role)) {
-								if (msg.role === 'assistant' && msg.content[0].type === 'function_request') {
-
-								} else {
+								if (msg.content[0].type !== 'function_request') {
 									const content = this.#prompt.contentToString(msg.content);
 									messages.push({ role: msg.role, content });
 								}
 							}
 						}
-					});
+					};
+					// Resume execution
+					await this.#prompt.triggerRequest();
 					ws.sendToConnection(conn.id, JSON.stringify({
 						action: 'server_sessionloaded',
 						id,
@@ -322,7 +350,7 @@ class AgentServer {
 			}
 		});
 		await server.create('v1', { port, host: '127.0.0.1', ws, strict: DEBUG, verbose: DEBUG }, API);
-		console.log(`ws running on port: ${port}`);
+		console.log(`Websocket server: ws://127.0.0.1:${port}/ws`);
 	}
 	/**
 	* Send a reset messages to all clients

package/lib/Cli.js

@@ -138,24 +138,30 @@ class Cli {
 		]);
 		// Write messages
 		this.#prompt.on('message', (msg) => {
+			let write = false;
 			if (msg.role === 'reasoning') {
 				const content = this.#prompt.contentToString(msg.content);
 				cli.focus('util');
 				cli.write(`REASONING: ---------\n${content}\n---------\n`);
+				write = true;
 			} else if (msg.role === 'log') {
 				const content = this.#prompt.contentToString(msg.content);
 				cli.focus('log');
 				cli.write(content);
+				write = true;
 			} else if (msg.role === 'assistant') {
 				if (msg.content[0].type === 'text') {
 					const content = this.#prompt.contentToString(msg.content);
 					if (content.trim() !== '') {
 						cli.focus('assistant');
 						cli.write(content);
+						write = true;
 					}
 				}
 			}
-			cli.startSpinner();
+			if (write) {
+			  cli.startSpinner();
+			}
 		});
 		this.#prompt.on('truncated', () => {
 			cli.focus('log');

package/lib/Prompt.js

@@ -11,15 +11,17 @@ import { pruneResolvedToolIOByCallIdExceptLast as pruneResolvedToolIOByCallIdExc
 /**
 * @typedef {import('./API/openai.com/reponses/text.js').request} OARequest
 * @typedef {import('./API/x.ai/text.js').request} XRequest
+* @typedef {import('./API/x.ai/responses.js').request} XAIRequest
 * @typedef {import('./API/anthropic.com/text.js').request} ANTHRequest
 * 
 * @typedef {import('./API/x.ai/text.js').XOptions} XOptions
+* @typedef {import('./API/x.ai/responses.js').XAIOptions} XAIOptions
 * @typedef {import('./API/openai.com/reponses/text.js').OAOptions} OAOptions
 * @typedef {import('./API/anthropic.com/text.js').ANTHOptions} ANTHOptions
 *
 * @typedef {import('./ToolSet.js').default} ToolSet
-* @typedef {OARequest|XRequest|ANTHRequest} request - The AI model to use for chat functionality.
-* @typedef {OAOptions|XOptions|ANTHOptions} options - Model options
+* @typedef {OARequest|XRequest|ANTHRequest|XAIRequest} request - The AI model to use for chat functionality.
+* @typedef {OAOptions|XOptions|ANTHOptions|XAIOptions} options - Model options
 */
 
 /** 

package/lib/ToolSet.js

@@ -126,6 +126,7 @@ class ToolSet {
 	* Execute a method
 	* @param {string} name
 	* @param {object} params
+	* @returns {Promise<*>}
 	*/
 	async call(name, params) {
 		if (!this.has(name)) {
@@ -158,8 +159,8 @@ class ToolSet {
 			try {
 				response = await this.call(call.function_request.name, JSON.parse(call.function_request.parameters));
 			} catch (error) {
-				prompt.emit(prompt.EVENTS.tool_error, { name: call.function_request.name, call_id: call.function_request.call_id, error });
 				response = `Error: ${error.name} - ${error.message}`;
+				prompt.emit(prompt.EVENTS.tool_error, { name: call.function_request.name, call_id: call.function_request.call_id, error: response });
 			}
 			const duration = new Date().getTime() - startTime;
 			prompt.emit(prompt.EVENTS.tool_response, { name: call.function_request.name, call_id: call.function_request.call_id, duration });