@j-o-r/hello-dave 0.1.1 → 0.1.5

package/lib/wsCli.js

@@ -1,287 +0,0 @@
-#!/usr/bin/env -S node
-/**
- * @fileoverview Interactive WebSocket CLI client for hello-dave agent servers.
- * Features: auto-reconnect, keyboard shortcuts (ALT-C/R/I/S/M, CTRL-K), 
- * session management, message history, clipboard copy.
- * 
- * Depends on @j-o-r/cli for terminal UI, @j-o-r/apiserver WebSocketClient, @j-o-r/sh for shell.
- */
-import cli from '@j-o-r/cli';
-import { WebSocketClient } from "@j-o-r/apiserver";
-import { SH } from '@j-o-r/sh';
-
-const OPEN = 1; // WebSocket.OPEN
-
-/**
- * @typedef {Object} WsMessage
- * @property {string} action - Action type (e.g., 'user_request')
- * @property {string} content - Message content
- * @property {number} id - Unique message ID
- */
-
-/**
- * Copy text to the clipboard using xclip.
- * @param {string} text - Text to copy
- * @returns {Promise<void>}
- */
-const copyToClipboard = async (text) => {
-	if (typeof text !== 'string') return;
-	if (text === '') text = ' ';
-	const prams = ['-selection', 'clipboard'];
-	await SH`xclip ${prams}`.options({ stdio: 'inherit' }).run(text);
-};
-
-/**
- * Launches an interactive CLI client connected to a hello-dave agent server via WebSocket.
- * Establishes persistent connection with auto-reconnect, handles user input,
- * keyboard shortcuts for common actions, and displays responses.
- * 
- * Keyboard shortcuts:
- * - ALT-C: Clear screen
- * - ALT-R: Reset session
- * - ALT-S: List/load sessions
- * - ALT-I: Server info
- * - ALT-M: Copy last message to clipboard
- * - CTRL-K: Show help
- * - CTRL-D: Exit (standard)
- * 
- * @param {string} connectUrl - WebSocket server endpoint (e.g., 'ws://localhost:8080')
- * @param {string} [secret=''] - Optional base64 secret for authenticated connections
- * @returns {void}
- * @example
- * import wsCli from './lib/wsCli.js';
- * wsCli('ws://localhost:8080', 'mysecret');
- */
-export default (connectUrl, secret = '') => {
-	let ws;
-	let busy = false;
-	let lastMessage = '';
-	const pendingRequests = new Map();
-	if (secret !== '') {
-		secret = Buffer.from(secret).toString('base64');
-	}
-
-	/**
-	 * Connects (or reconnects) to the WebSocket server.
-	 * Sets up event handlers for messages, close (auto-reconnect), errors.
-	 * Sends user_introduction on open.
-	 * 
-	 * @private
-	 * @returns {void}
-	 */
-	const connect = () => {
-		if (ws && ws.readyState === OPEN) {
-			console.log('Already connected');
-			return;
-		}
-		const url = connectUrl + '?wssrc_id=' + secret;
-		console.log(`Connecting to ${url}`);
-		ws = new WebSocketClient(url);
-
-		ws.onopen = () => {
-			console.log('Connected to server');
-			// Send introduction (no pending request for this)
-			const id = Date.now();
-			ws.send(JSON.stringify({
-				action: 'user_introduction',
-				content: '',
-				id
-			}));
-			cli.focus('user', true);
-		};
-
-		ws.onmessage = (m) => {
-			try {
-				const data = JSON.parse(m.data);
-				const msgId = data.id;
-				if (msgId && pendingRequests.has(msgId)) {
-					const { resolve, timeout } = pendingRequests.get(msgId);
-					clearTimeout(timeout);
-					pendingRequests.delete(msgId);
-					resolve(data);
-				}
-				// Ignore unsolicited messages for now
-			} catch (e) {
-				console.error('Error parsing WebSocket message:', e, m.data);
-			}
-		};
-
-		ws.onclose = (event) => {
-			console.log('Connection closed (reconnecting in 5s):', event.code, event.reason || 'No reason');
-			// Reject all pending requests
-			for (const [id, { reject, timeout }] of pendingRequests) {
-				clearTimeout(timeout);
-				reject(new Error(`Connection closed (${event.code})`));
-				pendingRequests.delete(id);
-			}
-			// Auto-reconnect
-			setTimeout(connect, 5000);
-		};
-
-		ws.onerror = (event) => {
-			console.error('WebSocket error:', event.toString());
-		};
-	};
-
-	/**
-	 * Sends a message and awaits response by ID.
-	 * Handles special response actions (e.g., server_response updates UI).
-	 * Manages busy state and spinner.
-	 * 
-	 * @private
-	 * @param {WsMessage} message - Message to send (id auto-added)
-	 * @returns {Promise<WsMessage>} Response data
-	 * @throws {Error} If not connected, timeout (12h), or connection error
-	 */
-	const sendMessage = async (message) => {
-		if (!ws || ws.readyState !== OPEN) {
-			throw new Error('WebSocket not connected');
-		}
-
-		const id = Date.now();
-		message.id = id;
-		busy = true;
-		cli.startSpinner();
-
-		const promise = new Promise((resolve, reject) => {
-			const timeout = setTimeout(() => {
-				if (pendingRequests.has(id)) {
-					pendingRequests.delete(id);
-					reject(new Error('Request timeout (12 hours)'));
-				}
-			}, 1000 * 60 * 60 * 12); // 12 hours
-			pendingRequests.set(id, { resolve, reject, timeout });
-		});
-
-		try {
-			ws.send(JSON.stringify(message));
-			const response = await promise;
-
-			// Handle specific response actions
-			if (response.action === 'server_response') {
-				cli.focus('assistant');
-				cli.write(response.content);
-				lastMessage = response.content;
-			} else if (response.action === 'server_info') {
-				cli.focus('util');
-				cli.write(response.content);
-			} else if (response.action === 'server_reset') {
-				cli.clear();
-			} else if (response.action === 'server_sessionlist') {
-				const list = response.content;
-				const selected = await cli.select('Select your session: ', list);
-				if (selected && selected !== 'NONE') {
-					await sendMessage({ action: 'user_loadsession', content: selected });
-				}
-			} else if (response.action === 'server_sessionloaded') {
-				cli.clear();
-				const messages = response.content;
-				messages.forEach((msg) => {
-					cli.focus(msg.role);
-					cli.write(msg.content);
-					lastMessage = msg.content;
-				});
-			}
-			// Other actions ignored
-			return response;
-		} catch (e) {
-			console.error('Request error:', e.message);
-		} finally {
-			if (pendingRequests.has(id)) {
-				const { timeout } = pendingRequests.get(id);
-				clearTimeout(timeout);
-				pendingRequests.delete(id);
-			}
-			busy = false;
-			cli.stopSpinner();
-			cli.focus('user', true);
-		}
-	};
-
-	// Register key mappings
-	cli.registerKeyMappings([
-		// ALT-C: Clear screen
-		{
-			name: 'c', ctrl: false, meta: true, shift: false,
-			handler: async () => {
-				if (!busy) {
-					cli.clear();
-				}
-			}
-		},
-		// ALT-R: Reset session
-		{
-			name: 'r', ctrl: false, meta: true, shift: false,
-			handler: async () => {
-				if (!busy) {
-					await sendMessage({ action: 'user_reset', content: '' });
-				}
-			}
-		},
-		// ALT-S: Session list
-		{
-			name: 's', ctrl: false, meta: true, shift: false,
-			handler: async () => {
-				if (!busy) {
-					await sendMessage({ action: 'user_sessionlist', content: '' });
-				}
-			}
-		},
-		// ALT-I: Server info
-		{
-			name: 'i', ctrl: false, meta: true, shift: false,
-			handler: async () => {
-				if (!busy) {
-					await sendMessage({ action: 'user_info', content: '' });
-				}
-			}
-		},
-		// ALT-M: Copy last message
-		{
-			name: 'm', ctrl: false, meta: true, shift: false,
-			handler: async () => {
-				if (!busy && lastMessage) {
-					await copyToClipboard(lastMessage);
-					cli.focus('util');
-					cli.write('Copied last message to clipboard');
-					cli.focus('user', true);
-				}
-			}
-		},
-		// CTRL-K: Help
-		{
-			name: 'k', ctrl: true, meta: false, shift: false,
-			handler: async () => {
-				cli.focus('util');
-				cli.write(`
-Available keys:
-• ALT-C: Clear screen
-• ALT-R: Reset session
-• ALT-I: Server info
-• ALT-S: List/load sessions
-• ALT-M: Copy last message
-• CTRL-K: Show help
-• CTRL-D: Exit
-`.trim());
-				cli.focus('user', true);
-			}
-		}
-	]);
-
-	// Input handler for user messages
-	cli.inputHandler = async (s) => {
-		if (busy || !s || !s.trim()) {
-			return;
-		}
-		await sendMessage({
-			action: 'user_request',
-			content: s.trim()
-		});
-	};
-
-	// Initialize
-	cli.focus('log');
-	cli.write('Connecting... (ALT-I for info, CTRL-K for keys, CTRL-D to exit)');
-
-	connect();
-};

package/lib/wsIO.js

@@ -1,90 +0,0 @@
-import { WebSocket } from 'ws';
-/*
-* Oneshot direct write response to/from a Agent server
-*/
-/**
-* @typedef {object} wsResponse
-* @property {string} action
-* @property {string} content
-* @property {number} id - message id
-*/
-/**
-* One-shot WebSocket client for hello-dave server using standard 'ws' library.
-* Connects directly to pure WS endpoint (no HTTP upgrade).
-* Sends intro + action, awaits matching response by ID, closes, returns response.
-* 
-* @param {string} connectUrl - Websocket server endpoint to connect to
-* @param {string} [secret=''] - Secret websocket connection key
-* @param {'user_request'|'user_info'|'user_reset'} action - Action to perform
-* @param {string} [input=''] - Input content (required for 'user_request')
-* @returns {Promise<wsResponse>}
-* @throws {Error} Invalid action or missing input for user_request
-* @example
-* const response = await wsio('ws://localhost:8080', 'secret', 'user_request', 'Hello!');
-* console.log(response.content);
-*/
-export default async function wsio(connectUrl, secret = '', action, input = '') {
-	if (!['user_request', 'user_reset', 'user_info'].includes(action)) {
-		throw new Error(`Invalid action: ${action}. Must be one of: user_request, user_reset, user_info`);
-	}
-	if (action === 'user_request' && (!input || typeof input !== 'string' || input.trim() === '')) {
-		throw new Error('Non-empty string input required for "user_request"');
-	}
-
-	let b64secret = '';
-	if (secret !== '') {
-		b64secret = Buffer.from(secret).toString('base64');
-	}
-
-	const url = `${connectUrl}${connectUrl.includes('?') ? '&' : '?'}wssrc_id=${b64secret}`;
-
-	return new Promise((resolve, reject) => {
-		const ws = new WebSocket(url);
-
-		let resolved = false;
-
-		const actionId = Date.now();
-
-		ws.on('open', () => {
-			// Send introduction first (matches wsConnect.js protocol)
-			const introId = Date.now() - 1;
-			ws.send(JSON.stringify({
-				action: 'user_introduction',
-				content: '',
-				id: introId
-			}));
-
-			// Send the action immediately after
-			ws.send(JSON.stringify({
-				action,
-				content: input,
-				id: actionId
-			}));
-		});
-
-		ws.on('message', (data) => {
-			try {
-				const parsed = JSON.parse(data.toString());
-				if (parsed.id === actionId) {
-					resolved = true;
-					ws.close(1000, 'Request complete');
-					resolve(parsed);
-				}
-			} catch (e) {
-				// Ignore non-JSON or non-matching messages (e.g., intro response)
-			}
-		});
-
-		ws.on('close', (code, reason) => {
-			if (!resolved) {
-				reject(new Error(`Connection closed (${code}): ${reason || 'Unknown reason'}`));
-			}
-		});
-
-		ws.on('error', (error) => {
-			if (!resolved) {
-				reject(new Error(`WebSocket error: ${error.message}`));
-			}
-		});
-	});
-}

package/types/API/x.ai/text.d.ts

@@ -1,286 +0,0 @@
-export type Prompt = import("../../Prompt.js").default;
-export type ToolSet = import("../../ToolSet.js").default;
-export type grokModels = "grok-4" | "grok-3" | "grok-3-mini" | "grok-3-fast" | "grok-3-mini-fast";
-export type grokReason = "low" | "high";
-export type SearchParameters = {
-    mode: "on" | "auto";
-    /**
-     * ISO-8601 date (YYYY-MM-DD)
-     */
-    from_date?: string | undefined;
-    /**
-     * ISO-8601 date (YYYY-MM-DD)
-     */
-    to_date?: string | undefined;
-    sources?: (RssSource | WebSource | NewsSource | XSource)[] | undefined;
-};
-export type RssSource = {
-    type: "rss";
-    links: string[];
-};
-export type WebSource = {
-    type: "web";
-    /**
-     * ISO-3166-1 alpha-2
-     */
-    country?: string | undefined;
-    safe_search?: boolean | undefined;
-    allowed_websites?: string[] | undefined;
-    excluded_websites?: string[] | undefined;
-};
-export type NewsSource = {
-    type: "news";
-    country?: string | undefined;
-    safe_search?: boolean | undefined;
-    allowed_websites?: string[] | undefined;
-    excluded_websites?: string[] | undefined;
-};
-export type XSource = {
-    type: "x";
-};
-export type XRequest = {
-    body: XOptions;
-    headers: Headers;
-    /**
-     * -
-     */
-    url: string;
-};
-export type XFunctionCall = {
-    /**
-     * - The name of the function to call.
-     */
-    name: string;
-    /**
-     * - The arguments for the function call in JSON string format.
-     */
-    arguments: string;
-};
-export type XToolCall = {
-    /**
-     * - The unique identifier for the tool call.
-     */
-    id: string;
-    /**
-     * - The type of the tool call, e.g., "function".
-     */
-    type: string;
-    /**
-     * - The function call details.
-     */
-    function: XFunctionCall;
-};
-export type XFunctionResponse = {
-    /**
-     * - must be 'tool'
-     */
-    role: string;
-    /**
-     * - The arguments for the function call in JSON string format.
-     */
-    content: string;
-    /**
-     * - The unique identifier for the tool call.
-     */
-    tool_call_id: string;
-};
-export type XMessageResponse = {
-    /**
-     * - The index of the message.
-     */
-    index: number;
-    /**
-     * - The message details.
-     */
-    message: {
-        role: string;
-        content: string;
-        reasoning_content?: string | undefined;
-        refusal: string | null;
-    };
-    /**
-     * - The reason for finishing (e.g., "stop").
-     */
-    finish_reason: string;
-    /**
-     * - The reason for finishing (e.g., "stop").
-     */
-    tools_calls: XToolCall[];
-};
-/**
- * https://docs.x.ai/api/endpoints#chat-completions
- */
-export type XOptions = {
-    /**
-     * - What model to use
-     */
-    model?: grokModels | undefined;
-    /**
-     * - the actual prompt
-     */
-    messages?: any[] | undefined;
-    /**
-     * , callable functions
-     */
-    tools?: XToolCall[] | undefined;
-    /**
-     * - Default 'none' when no function, 'auto' when present, or required
-     */
-    tool_choice?: string | undefined;
-    /**
-     * - Response format
-     */
-    response_format?: {
-        /**
-         * - The role of the sender (e.g., "assistant").
-         */
-        type?: string | undefined;
-    } | undefined;
-    /**
-     * -  What sampling temperature to use, between 0 and 2.
-     */
-    temperature?: number | undefined;
-    /**
-     * -  The maximum number of tokens allowed for the generated answer.
-     */
-    max_completion_tokens?: number | undefined;
-    /**
-     * -  Number between -2.0 and 2.0.
-     */
-    presence_penalty?: number | undefined;
-    /**
-     * - Number between -2.0 and 2.0.
-     */
-    frequency_penalty?: number | undefined;
-    /**
-     * -  Number between -2.0 and 2.0.
-     */
-    top_p?: number | undefined;
-    /**
-     * - How many chat completion choices to generate for each input message. default 1
-     */
-    n?: number | undefined;
-    /**
-     * - Chunk/stream request default null
-     */
-    stream?: boolean | undefined;
-    /**
-     * - Multiple calls at once
-     */
-    parallel_tool_calls?: boolean | undefined;
-    /**
-     * - Who i am
-     */
-    reasoning_effort?: grokReason | undefined;
-    /**
-     * - Who i am
-     */
-    user?: string | undefined;
-    /**
-     * - see options
-     */
-    seed?: number | undefined;
-    /**
-     * - live search
-     */
-    search_parameters?: SearchParameters | undefined;
-    /**
-     * - Up to 4 sequences where the API will stop generating further tokens.
-     */
-    stop?: string[] | undefined;
-};
-export type XResponse = {
-    /**
-     * - The unique identifier for the response.
-     */
-    id: string;
-    /**
-     * - The type of object returned, typically "chat.completion".
-     */
-    object: string;
-    /**
-     * - The timestamp of when the response was created.
-     */
-    created: number;
-    /**
-     * - The model used to generate the response.
-     */
-    model: string;
-    /**
-     * - An array of choice objects containing the response details.
-     */
-    choices: Array<XChoice>;
-    /**
-     * - An object containing token usage information.
-     */
-    usage: XUsage;
-    /**
-     * - The system fingerprint for the response.
-     */
-    system_fingerprint: string;
-    /**
-     * - HTTP headers associated with the response.
-     */
-    http_headers: Object;
-};
-export type XChoice = {
-    /**
-     * - The index of the choice in the response.
-     */
-    index: number;
-    /**
-     * - The message object containing the role and content.
-     */
-    message: XMessageResponse;
-    /**
-     * - Log probabilities, typically null.
-     */
-    logprobs: null;
-    /**
-     * - The reason why the response finished.
-     */
-    finish_reason: string;
-};
-export type XUsage = {
-    /**
-     * - The number of tokens in the prompt.
-     */
-    prompt_tokens: number;
-    /**
-     * - The number of tokens in the completion.
-     */
-    completion_tokens: number;
-    /**
-     * - The total number of tokens used.
-     */
-    total_tokens: number;
-};
-/**
-* Create an anthropic request
-* @param {Prompt} prompt
-* @param {ToolSet|void} [tools]
-* @param {XOptions} [opts] overwrite default request settings
-* @param {object} [hdrs] - optional headers to pass
-* @returns {XRequest}
-* @throws {Error}
-*/
-export function generateRequest(prompt: Prompt, tools?: void | import("../../ToolSet.js").default | undefined, opts?: XOptions, hdrs?: object): XRequest;
-/**
-* Process an openai response
-* @param {number} duration - the time is MS before and after the request
-* @param {import('@j-o-r/apiserver/types/request.js').FetchResponseObject} res
-* @param {Prompt} prompt
-* @param {ToolSet} [toolset]
-* @returns {Promise<void>}
-* @throws {Error}
-*/
-export function parseResponse(duration: number, prompt: Prompt, res: import("@j-o-r/apiserver/types/request.js").FetchResponseObject, toolset?: ToolSet): Promise<void>;
-/**
-* Do a request
-* @param {Prompt} prompt
-* @param {ToolSet|null} toolset
-* @param {XOptions} [options]:
-* @param {number} [counter] - leave empty this counts the number of requests when doing recursive request calls
-* @return {Promise<import('../../Session.js').Message>}
-*/
-export function request(prompt: Prompt, toolset?: ToolSet | null, options?: XOptions, counter?: number): Promise<import("../../Session.js").Message>;