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

package/{examples/codeDave.js → examples.bak.1774780058/code_agent.js}

@@ -77,9 +77,44 @@ const sys = (await agent.environment()).system;
 const prompt = `
 You are a coding assistant specializing in Bash and JavaScript (ESM/ESNext), with support for other languages. Assist by executing, reading, creating, querying, explaining, or helping with code. Use tools like 'execute_bash_script' for code execution and for writing and reading files, stay in the current working folder. Provide clear, step-by-step responses, examples, and ensure safety compliance.
 ---env
-${sys}
+\${sys}
 ---
- `.trim();
+
+**MANDATORY MEMORY PROTOCOL (For EVERY query/task - NO EXCEPTIONS):**
+
+Connected clients (todo_agent, readme_agent, npm_agent, docs_agent, **memory_agent**) are available as tools. **ALWAYS** use **memory_agent** FIRST and LAST:
+
+1. **RECALL PHASE (Step 1 of EVERY response)**:
+   - Call \`memory_agent "Recall relevant memories: tasks, errors, prefs for [keywords from user query]. List recent if empty."\`
+   - Incorporate recalled info (e.g., avoid known errors, resume tasks, apply prefs like temp=0.2).
+
+2. **CORE ACTION**:
+   - Perform coding assistance (tools: execute_bash_script, javascript_interpreter, read_file/write_file, web_search, etc.).
+   - Delegate to specialists if relevant:
+     - todo_agent: Tasks/TODO.md
+     - readme_agent: README.md
+     - npm_agent: NPM modules/package.json
+     - docs_agent: Documentation
+     - memory_agent: Persistent storage
+
+3. **WRITE PHASE (Step 3 of EVERY response)**:
+   - Call \`memory_agent "Store updates: [new tasks/errors/prefs/decisions from this interaction]. E.g., 'Task: [next step]', 'Error: [issue]', 'Pref: [setting]'"\`
+   - This ensures persistence across sessions/agents, prevents loops/token burn.
+
+**EXAMPLE FLOW**:
+User: "Fix bug in main.js"
+- 1. memory_agent "Recall: tasks errors code bugs main.js"
+- 2. read_file main.js → analyze/fix → write_file
+- 3. memory_agent "Write: Task completed: fixed main.js bug. New task: add tests."
+
+**PRIORITIES**:
+- Safety: CWD-only, no escapes, validate before write.
+- Efficiency: Use memories to skip repeats (e.g., "Known error: git conflict → skip").
+- Step-by-step: Clear responses with code blocks.
+- Current date: March 27, 2026.
+
+FOLLOW MEMORY PROTOCOL RIGIDLY - it's how multi-agent coordination works!
+`.trim();
 agent.setup({
 	prompt,
 	api,
@@ -97,9 +132,6 @@ if (toolset) {
 	agent.addGenericToolcall('write_file');
 
 	const addTools = (args['tools']) ? args['tools'].split(',') : [''];
-	// if (addTools.includes('javascript')) {
-	// 	agent.addGenericToolcall('javascript_interpreter');
-	// }
 	if (addTools.includes('ssh')) {
 		agent.addGenericToolcall('execute_remote_script');
 	}
@@ -107,9 +139,11 @@ if (toolset) {
 const cliIntro = `
 ${name} ${options.model}
 - context: ${contextWindow}
+- **Memory Protocol ACTIVE**: Auto-recalls/writes via memory_agent for every query!
 `.trim();
 const description = `
-Handles execution, reading, creation, querying, explaining and code help, with safety and folder restrictions.
+Main CodeServer hub: Coding expert + delegates to todo/readme/npm/docs/memory agents.
+ALWAYS uses memory_agent for persistent tasks/errors/prefs.
 `.trim();
 
 await agent.start(serve, connect, cliIntro, "code_agent", description);

package/{examples/CodeServer → examples.bak.1774780058/codeserver.sh}

@@ -30,14 +30,18 @@ pm2 delete "${FOLDER}_todo_agent_${PORT}"  2>/dev/null || true
 pm2 delete "${FOLDER}_readme_agent_${PORT}" 2>/dev/null || true
 pm2 delete "${FOLDER}_npm_agent_${PORT}" 2>/dev/null || true
 pm2 delete "${FOLDER}_docs_agent_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_test_agent_${PORT}" 2>/dev/null || true
+pm2 delete "${FOLDER}_memory_agent_${PORT}" 2>/dev/null || true
 
 # Spawn main Agent / server (absolute paths to scripts)
-pm2 start "${SCRIPT_DIR}/codeDave.js" --name "${FOLDER}_code_agent_${PORT}" -- --serve "${PORT}" --tools javascript --secret "${SECRET}"
+pm2 start "${SCRIPT_DIR}/code_agent.js" --name "${FOLDER}_code_agent_${PORT}" -- --serve "${PORT}" --tools javascript --secret "${SECRET}"
 # Attach clients
-pm2 start "${SCRIPT_DIR}/todoDave.js"   --name "${FOLDER}_todo_agent_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
-pm2 start "${SCRIPT_DIR}/readmeDave.js" --name "${FOLDER}_readme_agent_${PORT}" -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
-pm2 start "${SCRIPT_DIR}/npmDave.js"    --name "${FOLDER}_npm_agent_${PORT}"    -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
-pm2 start "${SCRIPT_DIR}/docsDave.js"   --name "${FOLDER}_docs_agent_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${SCRIPT_DIR}/todo_agent.js"   --name "${FOLDER}_todo_agent_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${SCRIPT_DIR}/readme_agent.js" --name "${FOLDER}_readme_agent_${PORT}" -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${SCRIPT_DIR}/npm_agent.js"    --name "${FOLDER}_npm_agent_${PORT}"    -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${SCRIPT_DIR}/docs_agent.js"   --name "${FOLDER}_docs_agent_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${SCRIPT_DIR}/test_agent.js"   --name "${FOLDER}_test_agent_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
+pm2 start "${SCRIPT_DIR}/memory_agent.js"   --name "${FOLDER}_memory_agent_${PORT}"   -- --connect "ws://127.0.0.1:${PORT}/ws" --secret "${SECRET}"
 
 echo "CodeServer 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/examples.bak.1774780058/memory_agent.js

@@ -0,0 +1,112 @@
+#!/usr/bin/env node
+import { AgentManager } from '@j-o-r/hello-dave';
+import { parseArgs } from '@j-o-r/sh';
+
+const name = 'memory_dave';
+const api = 'xai';
+let secret = '';
+
+const args = parseArgs();
+const help = args['help'] || false;
+const connect = args['connect'] ? args['connect'] : undefined;
+const serve = args['serve'] ? parseInt(args['serve']) : undefined;
+
+/** @type {import('lib/API/x.ai/responses.js').XAIOptions} */
+const options = { tools: [] };
+options.tools.push({ type: 'web_search' });
+
+if (args['secret']) {
+  secret = args['secret'];
+}
+if (args['model'] || true) {
+  options.model = args['model'] || 'grok-4-fast-reasoning';
+}
+if (args['temperature']) {
+  options.temperature = parseFloat(args['temperature']);
+}
+if (args['tokens']) {
+  options.max_output_tokens = parseInt(args['tokens']);
+}
+if (args['top_p']) {
+  options.top_p = parseFloat(args['top_p']);
+}
+options.reasoning = { effort: 'medium', summary: 'auto' };
+
+const toolsetMode = 'auto';
+const contextWindow = args['context'] ? parseInt(args['context']) : 250000;
+
+function printHelp() {
+  console.log(`
+'${name} --help' You are looking at it.
+
+Project Memory manager for CodeServer multi-agent setup. Stores/retrieves shared memories in .cache/memory.ndjson (tasks/errors/prefs).
+
+OPTIONS: --model ... --temp ... --secret ...
+SERVER: --serve PORT | --connect ws://host:PORT/ws
+`);
+  process.exit();
+}
+
+if (help) printHelp();
+
+const tool_call_description = `
+CodeServer Memory Agent. Manages shared agent memory (.cache/memory.ndjson) for tasks, errors, user prefs across all agents (code/todo/readme/npm/docs).
+Use before/after actions: Recall relevant memories, write updates to avoid loops/repetition.
+Categories: tasks (pending work), errors (failures to avoid), prefs (user settings).
+`.trim();
+
+const tool_call_name = 'memory_agent';
+
+const prompt = `
+You are MemoryDave, the dedicated memory manager for CodeServer multi-agent setup (code/todo/readme/npm/docs agents).
+
+**CORE TOOLS (from lib/genericToolset.js)**:
+- \`memory_recall [query]\`: Retrieve stored memories (tasks/errors/prefs). ALWAYS recall before acting (e.g., "tasks", "errors", "" for recent).
+- \`memory_write {category: "tasks|errors|prefs", content: "details"}\`: Persist info to avoid repetition/loops/token burn.
+
+**SHARED STORAGE**: .cache/memory.ndjson in project CWD (all agents share).
+
+**ALWAYS**:
+1. **RECALL FIRST**: \`memory_recall "<user_query|category|''>"\` to check prior state/tasks/errors/prefs.
+2. **ACT**: Analyze + decide (write if new info, delegate via server if needed).
+3. **WRITE IF CHANGED**: Use \`memory_write\` for decisions/tasks/errors/prefs (e.g., "Pending: review npm deps", "Error: loop in git", "Pref: low temp for code").
+4. Respond: Summarize memories used/updated + action taken.
+
+**USER QUERIES**:
+- "Recall tasks" → List + suggest next.
+- "Store task: Fix auth bug" → Write + confirm.
+- "Clear old errors" → Recall + write cleaned.
+- Coordinate: "Check if code agent has pending tasks" → Recall + advise.
+
+Use other tools (bash/read_file) only if needed for context. Focus on memory coordination to boost multi-agent efficiency.
+
+Current date: March 27, 2026.
+`.trim();
+
+const agent = new AgentManager({ name, secret });
+agent.setup({
+  prompt,
+  api,
+  options,
+  toolsetMode,
+  contextWindow
+});
+
+// Ensure memory tools are available (auto + explicit for emphasis)
+const toolset = agent.getToolset();
+if (toolset) {
+  // Core memory tools (already in 'auto', but explicit)
+  agent.addGenericToolcall('memory_recall');
+  agent.addGenericToolcall('memory_write');
+  // Helpers for inspection
+  agent.addGenericToolcall('execute_bash_script');
+  agent.addGenericToolcall('read_file');
+}
+
+const cliIntro = `
+🤖 ${name} (${options.model}) ready! Shared CodeServer memory manager (.cache/memory.ndjson).
+- context: ${contextWindow} tokens
+- Recall: "tasks" | Write: "store task: XYZ"
+`.trim();
+
+await agent.start(serve, connect, cliIntro, tool_call_name, tool_call_description);

package/{examples/spawndave.js → examples.bak.1774780058/spawn_agent.js}

@@ -2,7 +2,7 @@
 import { AgentManager } from '@j-o-r/hello-dave';
 import { parseArgs } from '@j-o-r/sh';
 
-const name = 'spawndave';
+const name = 'spawn_agent';
 const api = 'xai';
 let secret = '';
 
@@ -44,9 +44,9 @@ Guides you to create custom @j-o-r/hello-dave CLI agents (bin/<name>.js) w/ full
 PORTABLE: Runs in ANY project (auto-installs deps, no local docs needed). Docs: https://codeberg.org/duin/hello-dave (agent-manager.md, codeserver-pattern.md).
 
 USAGE:
-  npx @j-o-r/hello-dave spawndave         # Interactive creation
-  npx @j-o-r/hello-dave spawndave --name myagent "Desc"  # Semi-auto
-  echo "Create CodeServer launcher" | npx @j-o-r/hello-dave spawndave  # Multi-agent
+  npx @j-o-r/hello-dave spawn_agent         # Interactive creation
+  npx @j-o-r/hello-dave spawn_agent --name myagent "Desc"  # Semi-auto
+  echo "Create CodeServer launcher" | npx @j-o-r/hello-dave spawn_agent  # Multi-agent
 
 OPTIONS: --model [...] --temp [...] --secret [...]
 
@@ -86,6 +86,29 @@ const promptParts = [
   '',
   '**PORTABILITY**: Auto-install deps: `@j-o-r/hello-dave @j-o-r/sh`. Absolute imports. NO local file refs (docs/examples).',
   '',
+  '**MANDATORY MEMORY PROTOCOL (For EVERY query/task - NO EXCEPTIONS):**',
+  'Connected clients (todo_agent, readme_agent, npm_agent, docs_agent, **memory_agent**) are available as tools. **ALWAYS** use **memory_agent** FIRST and LAST:',
+  '1. **RECALL PHASE (Step 1 of EVERY response)**:',
+  '   - Call `memory_agent "Recall relevant memories: tasks, errors, prefs for [keywords from user query]. List recent if empty."`',
+  '   - Incorporate recalled info (e.g., avoid known errors, resume tasks, apply prefs like temp=0.2).',
+  '2. **CORE ACTION**:',
+  '   - Perform coding assistance (tools: execute_bash_script, javascript_interpreter, read_file/write_file, web_search, etc.).',
+  '   - Delegate to specialists if relevant:',
+  '     - todo_agent: Tasks/TODO.md',
+  '     - readme_agent: README.md',
+  '     - npm_agent: NPM modules/package.json',
+  '     - docs_agent: Documentation',
+  '     - memory_agent: Persistent storage',
+  '3. **WRITE PHASE (Step 3 of EVERY response)**:',
+  '   - Call `memory_agent "Store updates: [new tasks/errors/prefs/decisions from this interaction]. E.g., \'Task: [next step]\', \'Error: [issue]\', \'Pref: [setting]\'"`',
+  '   - This ensures persistence across sessions/agents, prevents loops/token burn.',
+  '',
+  '**PRIORITIES**:',
+  '- Safety: CWD-only, no escapes, validate before write.',
+  '- Efficiency: Use memories to skip repeats (e.g., "Known error: git conflict → skip").',
+  '- Step-by-step: Clear responses with code blocks.',
+  'FOLLOW MEMORY PROTOCOL RIGIDLY - it\'s how multi-agent coordination works!',
+  '',
   '**INITIAL INSPECT** (execute_bash_script):',
   '1. `npm ls @j-o-r/hello-dave @j-o-r/sh 2>/dev/null || echo MISSING` → If MISSING: `npm i @j-o-r/hello-dave @j-o-r/sh --save-exact`.',
   '2. `mkdir -p bin examples`.',
@@ -234,7 +257,7 @@ Examples:
 - "Create code-review agent: name=coderev, desc=Git diff analyzer, tools=read_file execute_bash_script web_search"
 - "Generate CodeServer launcher for coderev + tododave + npmdave"`.trim();
 
-const toolName = 'spawn_dave';
+const toolName = 'spawn_agent';
 const toolDescription = `Portable creator for CLI/WS agents (bin/<name>.js) + PM2 multi-agent launchers. Validates/tests/deploys. No local docs needed (uses repo: https://codeberg.org/duin/hello-dave).`.trim();
 
-await agent.start(serve, connect, cliIntro, toolName, toolDescription);
+await agent.start(serve, connect, cliIntro, toolName, toolDescription);

package/examples.bak.1774780058/test_agent.js

@@ -0,0 +1,162 @@
+#!/usr/bin/env node
+import { AgentManager } from '@j-o-r/hello-dave';
+import { parseArgs } from '@j-o-r/sh';
+
+const name = 'test_dave';
+const api = 'xai';
+let secret = '';
+
+const args = parseArgs();
+const help = args['help'] || false;
+const connect = args['connect'] ? args['connect'] : undefined;
+const serve = args['serve'] ? parseInt(args['serve']) : undefined;
+
+/** @type {import('lib/API/x.ai/responses.js').XAIOptions} */
+const options = {
+	tools: []
+};
+options.tools.push({
+	type: 'web_search'
+});
+if (args['secret']) {
+	secret = args['secret'];
+}
+if (args['model'] || true) {
+	options.model = args['model'] || 'grok-4-1-fast-reasoning';
+}
+options.temperature = 0.2;
+if (args['tokens']) {
+	options.max_output_tokens = parseInt(args['tokens']);
+}
+if (args['top_p']) {
+	options.top_p = parseFloat(args['top_p']);
+}
+const reasoning = args['reasoning'] ? args['reasoning'] : 'medium';
+if (reasoning) {
+	options.reasoning = {
+		effort: reasoning,
+		summary: 'auto'
+	};
+}
+const toolsetMode = 'auto';
+const contextWindow = args['context'] ? parseInt(args['context']) : 2565000;
+
+function printHelp() {
+	console.log(`
+'${name} --help' You are looking at it.
+
+OPTIONS:
+--tokens [number]: max generated tokens
+--context [number]: truncate message history to context-window size (default ${contextWindow})
+--temperature [float]: -2 / +2
+--model [string]: model name
+--top_p [float]: number > 0, 0.1 means no top_p
+--reasoning [low|medium|high]
+--tools [javascript,bash,nushell,ssh] comma separated list
+
+SERVER TOOLS:
+--serve [number]: create an Agent server on port ws://127.0.0.1:[serve]/ws
+--connect [url]: connect to a Server Agent e.g. ws://127.0.0.1:8080/ws (https://my.domain/ws)
+--secret [string]: limit access to websocket server with a secret
+`);
+	process.exit();
+}
+
+if (help) {
+	printHelp();
+}
+
+const agent = new AgentManager({ name, secret });
+const sys = (await agent.environment()).system;
+
+const prompt = `You are TestDave, the specialized testing agent for CodeServer projects. Your sole responsibility is to create, manage, and execute tests using the lightweight 'Test' class from '@j-o-r/sh' (already installed).
+
+**CORE MISSION**:
+- Write executable test scripts in ./scenarios/ folder with the extension *.test.js (e.g., scenarios/toolset.test.js).
+- 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.
+
+**WHAT TO TEST** (discover dynamically):
+1. Project scripts: e.g., parseArgs, AgentManager flows, toolsets.
+2. Utilities: SH commands, async hooks, promise tracking.
+3. Agents: codeDave, npmDave, memoryDave integrations.
+4. Existing: genericToolset.test.js patterns, sh.js, etc.
+- Query: "Write test for toolset.js" → read_file toolset.js → generate scenarios/toolset.test.js.
+
+**Test Example** (from @j-o-r/sh docs):
+\`\`\`
+#!/usr/bin/env node
+import { Test, assert, jsType } from '@j-o-r/sh';
+
+const t = new Test();
+t.add('Basic assert', () => assert.strictEqual(1 + 1, 2));
+t.add('Type check', () => assert.strictEqual(jsType([]), 'Array'));
+t.add('Async test', async () => {
+  const p = Promise.resolve('ok');
+  assert.strictEqual(await p, 'ok');
+});
+const report = await t.run();
+process.exit(report.errors > 0 ? 1 : 0);
+\`\`\`
+
+**WORKFLOW** (per user request, e.g., "test parseArgs"):
+1. Recall memories (tasks/errors for testing).
+2. Inspect target: read_file, execute_bash_script \`ls lib/\`, npm_module_inspector.
+3. Generate test: Plan tests (coverage: happy path, errors, async), write to scenarios/{target}.test.js (e.g., scenarios/parseArgs.test.js).
+4. Validate: execute_bash_script \`node scenarios/{target}.test.js\` or \`./scenarios/{target}.test.js\`.
+5. Report results, store outcomes.
+
+**MANDATORY MEMORY PROTOCOL** (ALWAYS FIRST/LAST):
+1. RECALL: memory_agent "Recall relevant memories: tasks, errors, prefs for [test target, e.g., toolset.js]."
+2. CORE: Write/Run tests in scenarios/*.test.js.
+3. WRITE: memory_agent "Store updates: Task: [next test], Error: [test fail], Pref: [coverage style]."
+
+**PRIORITIES**:
+- Safety: CWD-only, validate syntax before write (write_file auto-checks).
+- Coverage: assertions (strictEqual, ok, throws), types (jsType), async (promises).
+- Executable: shebang + chmod +x scenarios/*.test.js.
+- Reuse: Import project utils (e.g., import {parseArgs} from './toolset.js').
+- Current date: March 27, 2026.
+
+FOLLOW RIGIDLY: Memory first/last, scenarios/*.test.js only, Test class exclusively.
+`.trim();
+
+agent.setup({
+	prompt,
+	api,
+	options,
+	toolsetMode,
+	contextWindow
+});
+
+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');
+	agent.addGenericToolcall('write_file');
+	const addTools = args['tools'] ? args['tools'].split(',') : [''];
+	if (addTools.includes('ssh')) {
+		agent.addGenericToolcall('execute_remote_script');
+	}
+}
+
+const cliIntro = `
+${name} ${options.model}
+- context: ${contextWindow}
+- **Test Agent ACTIVE**: Writes/runs @j-o-r/sh Test scripts in ./scenarios/*.test.js (auto-executable).
+- Example: "Write test for lib/MyClass.js"
+- **Memory Protocol ACTIVE**
+`.trim();
+
+const description = `
+TestDave: Generates executable tests (Test class) for project files/utils/agents in ./scenarios/*.test.js.
+Uses memories, delegates to code/npm/etc. agents.
+`.trim();
+
+await agent.start(serve, connect, cliIntro, 'test_agent', description);

package/{examples/todoDave.js → examples.bak.1774780058/todo_agent.js}

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
 import { AgentManager } from '@j-o-r/hello-dave';
-import { parseArgs, readIn } from '@j-o-r/sh';
+import { parseArgs } from '@j-o-r/sh';
 
 const name = 'todo_dave';
 const api = 'xai';
 let secret = '';
 
-const input = ''; // await readIn() /* not compabtible with `pm2` */;
 const args = parseArgs();
 const help = args['help'] || false;
 const connect = args['connect'] ? args['connect'] : undefined;
@@ -88,6 +87,13 @@ You are an expert TODO manager for this project. TODO.md stores tasks in Markdow
 ## Done
 - [x] Completed task
 
+**CRITICAL: STRICT NO-CODING RULE** - Stick to TODO management ONLY. NEVER:
+- Use coding tools (e.g., javascript_interpreter, write_file, read_file, syntax_check).
+- Generate, execute, or edit code.
+- Misuse bash for anything beyond safe TODO.md ops (e.g., cat TODO.md, echo > TODO.md).
+If asked to code, decline: "For coding, use other agents. I'll handle TODOs only."
+Delegate complex tasks via suggestions; use memory_agent if available for persistence.
+
 ALWAYS:
 
 1. Inspect the current TODO.md file if it exists (use \`cat TODO.md\` or similar).

package/lib/API/x.ai/responses.js

@@ -160,7 +160,7 @@ const API_URL = 'https://api.x.ai/v1/responses';
 */
 const getHeaders = () => {
 	if (!process.env['XAIKEY']) {
-		throw new Error('Missing XAIKEY! export XAIKEY=<XAIKEY>')
+		throw new Error('Missing XAIKEY! export XAIKEY=[XAIKEY]')
 	}
 	const KEY = process.env['XAIKEY'];
 	return {
@@ -301,7 +301,7 @@ function getBody(prompt, toolset, options) {
 	// From the messages I only want assistant and user
 	/** @type {XAIOptions} */
 	// @ts-ignore
-	const body = { ...defaultSettings, ...options };
+	const body = { ...defaultSettings, ...(options || {}) };
 	// const body = options ? mergeOptions(DEFAULT_OPTIONS, options) : DEFAULT_OPTIONS;
 	body.instructions = prompt.hasSystemprompt ? prompt.system_prompt : '';
 	// the last messages should be a role tool or user else the model cannot handle the request
@@ -447,14 +447,14 @@ async function parseResponse(duration, prompt, res, toolset) {
 * @param {number} [counter] - leave empty this counts the number of requests when doing recursive request calls
 * @return {Promise<import('../../Session.js').Message>}
 */
-async function request(prompt, toolset = null, options, counter = 0) {
+async function request(prompt, toolset = null, options = {}, counter = 0) {
 	// Max number of recurusive calls
 	const counterMax = GLOBAL.max_recursive_requests;
 	const start = new Date().getTime();
-	if (counter === 0) {
+	// if (counter === 0) {
 		// Fresh request
 		delete options.previous_response_id
-	}
+	// }
 	// Generate the request
 	const { url, headers, body } = generateRequest(prompt, toolset, options);
   prompt.emit(prompt.EVENTS.http_request, {url, counter, body});
@@ -480,11 +480,9 @@ async function request(prompt, toolset = null, options, counter = 0) {
 		// need to do another roundtrip to include the funtion_responses
 		// And add the previousId for toolsets to work
 		if (!options) {
-			// @ts-ignore
-			// options = {previous_response_id: previousId}
-		} else {
-			// options.previous_response_id = previousId
+			options = {};
 		}
+		options.previous_response_id = previousId;
 		await sleep('2s');
 		return request(prompt, toolset, options, counter)
 	} else {

package/lib/AgentManager.js

@@ -151,8 +151,9 @@ class AgentManager {
   	return env();
   }
   /**
-   * Add (copy) a pre-defined toolcall to the function_calls
-   * @param {'read_file'|'write_file'|'get_user_env'|'execute_bash_script'|'send_email'|'open_link'|'execute_remote_script'|'history_search'|'javascript_interpreter'} name - name /^[a-z_0-9]{2,}$/ e.g. 'execute_bash_script'
+   * 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,}$/;

package/lib/AgentServer.js

@@ -131,7 +131,7 @@ class AgentServer {
 	#debug = false;
 	#port = 8000;
 	#name = '';
-  #secret = ''; // access secret
+	#secret = ''; // access secret
 	#description = '';
 	/** @type {Prompt} */
 	#prompt
@@ -163,19 +163,19 @@ class AgentServer {
 		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) => {
-		 		// 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, '  '));
-		 		}
-		 	});
-		 });
+		const events = Object.keys(this.#prompt.EVENTS);
+		events.forEach((evt) => {
+			this.#prompt.on(evt, (_msg) => {
+				// 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, '  '));
+				}
+			});
+		});
 		// start 
 		(async () => {
 			await this._start();
@@ -302,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,