@j-o-r/hello-dave 0.0.5 → 0.0.7

package/{examples → agents}/test_agent.js

@@ -55,19 +55,19 @@ function printHelp() {
 ## USAGE MODES:
 
 ### 1. Direct Call (One-Shot, Positional ONLY):
-./examples/${name}.js "Generate test for toolset.js" [--options]
+./agents/${name}.js "Generate test for toolset.js" [--options]
 
 ### 2. Interactive CLI (no positional arg):
-./examples/${name}.js [--options]
+./agents/${name}.js [--options]
 
 ### 3. WS Server (no positional arg):
-./examples/${name}.js --serve 8080 [--secret mysecret] [--options]
+./agents/${name}.js --serve 8080 [--secret mysecret] [--options]
 
 ### 4. WS Client (no positional arg):
-./examples/${name}.js --connect ws://127.0.0.1:8080/ws --secret mysecret [--options]
+./agents/${name}.js --connect ws://127.0.0.1:8080/ws --secret mysecret [--options]
 
 ### 5. Hybrid (Server + Client, no positional arg):
-./examples/${name}.js --serve 8081 --connect ws://other:8080/ws [--secret ...] [--options]
+./agents/${name}.js --serve 8081 --connect ws://other:8080/ws [--secret ...] [--options]
 
 ## SERVER OPTIONS EXPLAINED:
 --serve [port]: Starts WebSocket SERVER at ws://127.0.0.1:[port]/ws. Allows other agents (--connect) to connect and use this agent as a remote TOOL (e.g., 'test_agent'). Runs indefinitely until Ctrl+C.
@@ -108,7 +108,7 @@ const prompt = `You are TestAgent, the specialized testing agent for CodeServer
 - Tests must use: \`import { Test, assert, jsType } from '@j-o-r/sh';\`
 - Structure: shebang \`#!/usr/bin/env node\`, fluent Test API (\`const t = new Test(); t.add('desc', () => { assert... }); await t.run();\`), exit(1) on errors.
 - After write_file to scenarios/MODULE.test.js, ensure executable: \`chmod +x scenarios/MODULE.test.js\`
-- Leverage project utilities: test existing files (examples/*.js, toolset.js, agents, SH commands, etc.) using read_file, execute_bash_script (ls/cat), npm_module_inspector.
+- Leverage project utilities: test existing files (agents/*.js, toolset.js, agents, SH commands, etc.) using read_file, execute_bash_script (ls/cat), npm_module_inspector.
 
 **WHAT TO TEST** (discover dynamically):
 1. Project scripts: e.g., parseArgs, AgentManager flows, toolsets.
@@ -166,8 +166,6 @@ agent.setup({
 const toolset = agent.getToolset();
 if (toolset) {
 	agent.addGenericToolcall('history_search');
-	agent.addGenericToolcall('memory_recall');
-	agent.addGenericToolcall('memory_write');
 	agent.addGenericToolcall('javascript_interpreter');
 	agent.addGenericToolcall('execute_bash_script');
 	agent.addGenericToolcall('read_file');

package/{examples → agents}/todo_agent.js

@@ -55,19 +55,19 @@ function printHelp() {
 ## USAGE MODES:
 
 ### 1. Direct Call (One-Shot, Positional ONLY):
-./examples/${name}.js "List tasks" [--options]
+./agents/${name}.js "List tasks" [--options]
 
 ### 2. Interactive CLI (no positional arg):
-./examples/${name}.js [--options]
+./agents/${name}.js [--options]
 
 ### 3. WS Server (no positional arg):
-./examples/${name}.js --serve 8080 [--secret mysecret] [--options]
+./agents/${name}.js --serve 8080 [--secret mysecret] [--options]
 
 ### 4. WS Client (no positional arg):
-./examples/${name}.js --connect ws://127.0.0.1:8080/ws --secret mysecret [--options]
+./agents/${name}.js --connect ws://127.0.0.1:8080/ws --secret mysecret [--options]
 
 ### 5. Hybrid (Server + Client, no positional arg):
-./examples/${name}.js --serve 8081 --connect ws://other:8080/ws [--secret ...] [--options]
+./agents/${name}.js --serve 8081 --connect ws://other:8080/ws [--secret ...] [--options]
 
 ## SERVER OPTIONS EXPLAINED:
 --serve [port]: Starts WebSocket SERVER at ws://127.0.0.1:[port]/ws. Allows other agents (--connect) to connect and use this agent as a remote TOOL (e.g., 'todo_agent'). Runs indefinitely until Ctrl+C.

package/bin/codeDave

@@ -0,0 +1,58 @@
+#!/bin/bash
+if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+  echo "Usage: $0 <PORT> [SECRET]  # PORT: 1024-65535, SECRET: optional (defaults to '123')"
+  exit 1
+fi
+
+PORT="$1"
+SECRET="${2:-123}"
+
+if [ -z "$SECRET" ] || [ ${#SECRET} -lt 3 ]; then
+  echo "Error: SECRET must be at least 3 characters: '$SECRET'"
+  exit 1
+fi
+
+if ! [[ "$PORT" =~ ^[0-9]+$ ]] || [ "$PORT" -lt 1024 ] || [ "$PORT" -gt 65535 ]; then
+  echo "Error: Invalid port number: $PORT. Must be between 1024 and 65535."
+  exit 1
+fi
+
+# Compute canonical paths relative to THIS script's real location (resolves symlinks for global npm installs)
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do
+  DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+done
+SCRIPT_DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+PROJECT_DIR="$( cd -P "$( dirname "$SCRIPT_DIR" )" >/dev/null 2>&1 && pwd )"
+
+# FOLDER: basename of CURRENT WORKING DIRECTORY (pwd) for per-project PM2 prefixes (e.g., myproject_code_8080)
+# This allows multi-project usage without name conflicts; PROJECT_DIR remains package location for agents/
+FOLDER=$(basename "$(pwd)")
+
+echo "Starting codeDave on port ${PORT} in folder '${FOLDER}' (SCRIPT_DIR: ${SCRIPT_DIR}) with SECRET '${SECRET}'..."
+
+# Delete existing processes with folder_port suffix
+pm2 delete "${FOLDER}_code_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_todo_${PORT}"  2>/dev/null || true
+pm2 delete "${FOLDER}_readme_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_npm_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_docs_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_test_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_memory_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_spawn_${PORT}" 2>/dev/null || true
+
+# Spawn main Agent / server (absolute paths to scripts)
+pm2 start "${PROJECT_DIR}/agents/code_agent.js" --name "${FOLDER}_code_${PORT}" -- --serve "${PORT}" --tools javascript --secret "${SECRET}"
+# Attach clients
+pm2 start "${PROJECT_DIR}/agents/todo_agent.js"   --name "${FOLDER}_todo_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${PROJECT_DIR}/agents/readme_agent.js" --name "${FOLDER}_readme_${PORT}" -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${PROJECT_DIR}/agents/npm_agent.js"    --name "${FOLDER}_npm_${PORT}"    -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${PROJECT_DIR}/agents/docs_agent.js"   --name "${FOLDER}_docs_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${PROJECT_DIR}/agents/test_agent.js"   --name "${FOLDER}_test_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${PROJECT_DIR}/agents/memory_agent.js" --name "${FOLDER}_memory_${PORT}" -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${PROJECT_DIR}/agents/spawn_agent.js"  --name "${FOLDER}_spawn_${PORT}"    -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+
+echo "codeDave processes spawned with prefix '${FOLDER}_' and suffix _${PORT}. Check with: pm2 list | grep '${FOLDER}_${PORT}'"
+echo "dave --connect ws://127.0.0.1:${PORT}/ws --secret '$SECRET'"

package/bin/dave.js

@@ -1,9 +1,7 @@
 #!/usr/bin/env -S node
 import path from 'node:path';
 import cli from '@j-o-r/cli';
-import wsCli from '../lib/wsCli.js';
-import wsIO from '../lib/wsIO.js';
-import { AgentManager } from '@j-o-r/hello-dave';
+import { AgentManager, wsCli, wsIO } from '@j-o-r/hello-dave';
 import { SH, parseArgs, readIn, bashEscape } from '@j-o-r/sh';
 import { fileURLToPath } from 'node:url';
 
@@ -20,78 +18,148 @@ FLAGS:
 --search "[search_query_or_regex]" : Search in cache history
 --list : List all agent sessions in this folder
 --inspect "[path_to_ndjson_log]" : Inspect, Format and output a ndjson log file
---connect [ws://url][--secret "..."] : Connect to Agent websocket server
+--connect [ws://url] [--secret "..."] : Connect to Agent websocket server
   Interactive: bin/dave.js --connect 'ws://localhost:8080' --secret '123'
   Piped actions:
     echo "predict the weather" | bin/dave.js --connect 'ws://...' --secret '123'  # user_request
     echo "user_info" | bin/dave.js --connect 'ws://...' --secret '123'           # user_info
     echo "user_reset" | bin/dave.js --connect 'ws://...' --secret '123'          # user_reset
---code [port] [secret] : Launch CodeServer PM2 cluster via examples/codeserver.sh
+--ask [--connect [ws://url]] [--secret "..."] [--model modelname] : Ask agent locally (XAIKEY req.) or remote
+  Local:        bin/dave.js --ask [--model grok-4-1-fast-reasoning]
+  Remote:       bin/dave.js --ask --connect 'ws://localhost:8080' --secret '123'
+  Piped local:  echo "predict the weather" | bin/dave.js --ask
+  Piped remote: echo "predict the weather" | bin/dave.js --ask --connect 'ws://...' --secret '123'
+--code [port] [--secret "..."] : Launch CodeServer PM2 cluster via agents/codeserver.sh
   Usage: bin/dave.js --code 8080 --secret 123
---ask : Launches a CLI and ask questions about whatever is on your mind
-        XAIKEY required: export XAIKEY=xai-...
 `);
 	process.exit(exitCode)
 }
 
 // Make sure an action is defined
-const keys = Object.keys(args);
-if (
-	!(
-		keys.indexOf('--help') > -1 ||
-		keys.indexOf('--clear') > -1 ||
-		keys.indexOf('--search') > -1 ||
-		keys.indexOf('--list') > -1 ||
-		keys.indexOf('--inspect') > -1 ||
-		keys.indexOf('--connect') > -1 ||
-		keys.indexOf('--spawn') > -1 ||
-		keys.indexOf('--code') > -1 ||
-		keys.indexOf('--ask') > -1
-	)
-) {
+const actions = ['help', 'clear', 'search', 'list', 'inspect', 'connect', 'code', 'ask'];
+if (!actions.some(key => args[key])) {
 	printHelp(1);
 }
 
-if (args['--help']) {
+if (args.help) {
 	printHelp();
 }
 
-if (args['--clear']) {
-	const clear_sessions = path.resolve(__dirname, '..', 'utils', 'clear_sessions.sh')
+if (args.clear) {
+	const clear_sessions = path.resolve(__dirname, '..', 'utils', 'clear_sessions.sh');
 	const y = await cli.yesNo('Delete entire cache? (y/n) ');
 	if (y) {
 		console.log(clear_sessions);
-	  const res = await SH`${clear_sessions}`.run()
-	  console.log(res);
+		const res = await SH`${clear_sessions}`.run();
+		console.log(res);
 	}
 	process.exit();
-} else if (args['--search']) {
-	const history_search = path.resolve(__dirname, '..', 'utils', 'search_sessions.sh')
-	if (typeof args['--search'] !== 'string') {
-		printHelp(1)
+} else if (args.search) {
+	const history_search = path.resolve(__dirname, '..', 'utils', 'search_sessions.sh');
+	if (typeof args.search !== 'string') {
+		printHelp(1);
 	}
-	const res = await SH`${history_search} "${bashEscape(args['--search'])}"`.run();
+	const res = await SH`${history_search} "${bashEscape(args.search)}"`.run();
 	console.log(res);
 	process.exit();
-} else if (args['--list']) {
+} else if (args.list) {
 	const list = path.resolve(__dirname, '..', 'utils', 'list_sessions.sh');
 	const res = await SH`${list}`.run();
 	console.log(res);
 	process.exit();
-} else if (args['--inspect']) {
-	const format = path.resolve(__dirname, '..', 'utils', 'format_log.js')
-	if (typeof args['--inspect'] !== 'string') {
-		printHelp(1)
+} else if (args.inspect) {
+	const format = path.resolve(__dirname, '..', 'utils', 'format_log.js');
+	if (typeof args.inspect !== 'string') {
+		printHelp(1);
 	}
 	try {
-		const res = await SH`${format} "${bashEscape(args['--inspect'])}"`.run();
+		const res = await SH`${format} "${bashEscape(args.inspect)}"`.run();
 		console.log(res);
 	} catch (e) {
 		console.error(e);
 		process.exit(1);
 	}
-} else if (args['--connect']) {
-	let secret = args['--secret'] ? args['--secret'] : '';
+} else if (args.ask) {
+	let secret = args.secret || '';
+	if (args.connect) {
+		// Remote mode: same as --connect
+		if (typeof pipedInput === 'string' && pipedInput.trim() !== '') {
+			// Piped input mode: use wsIO for one-shot actions
+			let action, input;
+			const trimmed = pipedInput.trim();
+			if (trimmed === 'user_info' || trimmed === 'user_reset') {
+				action = trimmed;
+				input = '';
+			} else {
+				action = 'user_request';
+				input = trimmed;
+			}
+
+			try {
+				const response = await wsIO(args.connect, secret, action, input);
+				console.log(response.content);
+			} catch (e) {
+				console.error(`Error: ${e.message}`);
+				process.exit(1);
+			}
+		} else {
+			// No piped input: interactive wsCli mode
+			wsCli(args.connect, secret);
+		}
+	} else {
+		// Local mode
+		const name = 'ask_dave';
+		const api = 'xai';
+		const contextWindow = 1900000;
+		const toolsetMode = 'auto';
+		/** @type {import('lib/API/x.ai/responses.js').XAIOptions} */
+		const options = {
+			tools: []
+		};
+		options.tools.push({ type: 'web_search' });
+		options.tools.push({ type: 'x_search' });
+		options.model = args.model || 'grok-4-1-fast-reasoning';
+		options.temperature = 0.2;
+		options.reasoning = { effort: 'medium', summary: 'auto' };
+
+		const prompt = `
+Respond briefly and directly, using minimal words. Reason step-by-step first. Focus solely on core point; avoid elaboration or follow-ups. If unclear, ask clarifying questions before proceeding.
+		`.trim();
+
+		const agent = new AgentManager({ name });
+		agent.setup({
+			prompt,
+			api,
+			options,
+			toolsetMode,
+			contextWindow
+		});
+		agent.addGenericToolcall('open_link');
+		agent.addGenericToolcall('send_email');
+		agent.addGenericToolcall('history_search');
+
+		const cliIntro = `
+${name} (${options.model}).
+- context: ${contextWindow}
+		`.trim();
+		const description = `Ask dave, he knows.`.trim();
+
+		// Support piped one-shot (like --connect), else interactive CLI
+		if (typeof pipedInput === 'string' && pipedInput.trim() !== '') {
+			try {
+				const response = await agent.directCall(pipedInput.trim());
+				console.log(response);
+			} catch (e) {
+				console.error(`Error: ${e.message}`);
+				process.exit(1);
+			}
+		} else {
+			await agent.start(undefined, undefined, cliIntro, name, description);
+		}
+	}
+} else if (args.connect) {
+	// Pure --connect (no --ask): same logic
+	let secret = args.secret || '';
 
 	if (typeof pipedInput === 'string' && pipedInput.trim() !== '') {
 		// Piped input mode: use wsIO for one-shot actions
@@ -106,7 +174,7 @@ if (args['--clear']) {
 		}
 
 		try {
-			const response = await wsIO(args['--connect'], secret, action, input);
+			const response = await wsIO(args.connect, secret, action, input);
 			console.log(response.content);
 		} catch (e) {
 			console.error(`Error: ${e.message}`);
@@ -114,63 +182,13 @@ if (args['--clear']) {
 		}
 	} else {
 		// No piped input: interactive wsCli mode
-		wsCli(args['--connect'], secret);
+		wsCli(args.connect, secret);
 	}
-} else if (args['--code']) {
-	const port = parseInt(args['--code'] || '8080');
-	const secret = args['--secret'] ? args['--secret'].trim() : '123';
+} else if (args.code) {
+	const port = parseInt(args.code || '8080');
+	const secret = (args.secret || '').trim() || '123';
 	const server = path.resolve(__dirname, '..', 'examples', 'codeserver.sh');
-  const RES = await SH`${server} ${port} ${bashEscape(secret)}`.run();
-  console.log(RES);
+	const RES = await SH`${server} ${port} ${bashEscape(secret)}`.run();
+	console.log(RES);
 	process.exit(0);
-} else if (args['--ask']) {
-	const name = 'ask_dave';
-	const api = 'xai';
-	let secret = '';
-	const contextWindow = 1900000;
-	const toolsetMode = 'auto';
-	/** @type {import('lib/API/x.ai/responses.js').XAIOptions} */
-	const options = {
-		tools: []
-	};
-	options.tools.push({ type: 'web_search' });
-	options.tools.push({ type: 'x_search' });
-	options.model = args['--model'] || args.model || 'grok-4-1-fast-reasoning';
-	options.temperature = 0.2;
-	options.reasoning = { effort: 'medium', summary: 'auto' };
-
-	const prompt = `
-Respond briefly and directly, using minimal words. Reason step-by-step first. Focus solely on core point; avoid elaboration or follow-ups. If unclear, ask clarifying questions before proceeding.
-	`.trim();
-
-	const agent = new AgentManager({ name, secret });
-	agent.setup({
-		prompt,
-		api,
-		options,
-		toolsetMode,
-		contextWindow
-	});
-	agent.addGenericToolcall('open_link');
-	agent.addGenericToolcall('send_email');
-	agent.addGenericToolcall('history_search');
-
-	const cliIntro = `
-${name} ${options.model}.
-- context: ${contextWindow}
-	`.trim();
-	const description = `Ask dave, he knows.`.trim();
-
-	// Support piped one-shot (like --connect), else interactive CLI
-	if (typeof pipedInput === 'string' && pipedInput.trim() !== '') {
-		try {
-			const response = await agent.directCall(pipedInput.trim());
-			console.log(response);
-		} catch (e) {
-			console.error(`Error: ${e.message}`);
-			process.exit(1);
-		}
-	} else {
-		await agent.start(undefined, undefined, cliIntro, name, description);
-	}
 }