@xalia/agent 0.5.0 → 0.5.2

package/dist/agent/src/tool/chatMain.js

@@ -0,0 +1,207 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.chatMain = void 0;
+const cmd_ts_1 = require("cmd-ts");
+const process_1 = require("process");
+const fs = __importStar(require("fs"));
+const tool_1 = require("@xalia/xmcp/tool");
+const sdk_1 = require("@xalia/xmcp/sdk");
+const client_1 = require("../chat/client");
+const server_1 = require("../chat/server");
+const prompt_1 = require("./prompt");
+const options = __importStar(require("./options"));
+const logger = (0, sdk_1.getLogger)();
+const server = (0, cmd_ts_1.command)({
+    name: "server",
+    args: {
+        port: (0, cmd_ts_1.option)({
+            type: cmd_ts_1.number,
+            long: "port",
+            short: "p",
+            env: "CHAT_SERVER_PORT",
+            defaultValue: () => 5003,
+        }),
+        supabaseUrl: options.supabaseUrl,
+        supabaseKey: options.supabaseKey,
+        llmUrl: options.llmUrl,
+        xmcpUrl: options.xmcpUrl,
+        pidFile: options.pidFile,
+    },
+    handler: async ({ port, supabaseUrl, supabaseKey, llmUrl, xmcpUrl, pidFile, }) => {
+        if (pidFile) {
+            fs.writeFileSync(pidFile, process.pid.toString());
+        }
+        (0, server_1.runServer)(port, supabaseUrl, supabaseKey, llmUrl, xmcpUrl);
+    },
+});
+const client = (0, cmd_ts_1.command)({
+    name: "client",
+    args: {
+        host: (0, cmd_ts_1.option)({
+            type: cmd_ts_1.string,
+            long: "host",
+            short: "h",
+            env: "CHAT_SERVER_HOST",
+            defaultValue: () => "localhost",
+        }),
+        port: (0, cmd_ts_1.option)({
+            type: cmd_ts_1.number,
+            long: "port",
+            short: "p",
+            env: "CHAT_SERVER_PORT",
+            defaultValue: () => 5003,
+        }),
+        apiKey: options.apiKey,
+        session: (0, cmd_ts_1.option)({
+            type: cmd_ts_1.string,
+            long: "session",
+            description: "Session identifier (id, name, user/name)",
+            env: "SESSION",
+        }),
+        agentProfile: (0, cmd_ts_1.option)({
+            type: (0, cmd_ts_1.optional)(cmd_ts_1.string),
+            long: "agent-profile",
+            description: "Create new session using agent profile (id, name)",
+            env: "AGENT_PROFILE",
+        }),
+        script: (0, cmd_ts_1.option)({
+            type: (0, cmd_ts_1.optional)(cmd_ts_1.string),
+            long: "script",
+            description: "Script (file) to execute and then exit.",
+        }),
+        test: (0, cmd_ts_1.flag)({
+            long: "test",
+            description: "Run a test client and disconnect",
+        }),
+    },
+    handler: async ({ host, port, apiKey, session, agentProfile, script, test, }) => {
+        if (!apiKey) {
+            // TODO: configFIle param list in ../main.ts
+            const sudomcpConfig = tool_1.configuration.loadEnsureConfig();
+            apiKey = sudomcpConfig.api_key;
+        }
+        if (test) {
+            await runClientTest(host, port, apiKey, session);
+            return;
+        }
+        if (script) {
+            await runScript(host, port, apiKey, session, agentProfile, script);
+            return;
+        }
+        const onMessage = getCLIOnMessage();
+        const repl = new prompt_1.Prompt();
+        const client = await client_1.ChatClient.init(host, port, apiKey, onMessage, () => repl.shutdown(), session, agentProfile);
+        logger.debug("client created");
+        while (true) {
+            const msgText = await repl.run("ME: ");
+            logger.debug(`prompt got '${msgText}'`);
+            if (msgText === undefined) {
+                logger.debug("exiting...");
+                client.close();
+                return;
+            }
+            if (msgText.length > 0) {
+                const msg = {
+                    type: "msg",
+                    message: msgText,
+                };
+                client.sendMessage(msg);
+            }
+            else {
+                logger.debug("(ignoring empty message)");
+            }
+        }
+    },
+});
+function getCLIOnMessage() {
+    let startMsg = true;
+    return (msg) => {
+        switch (msg.type) {
+            case "user_msg":
+                process_1.stdout.write(`[${msg.from}]: ${msg.message}\n`);
+                break;
+            case "agent_msg":
+                process_1.stdout.write(`[AGENT]: ${msg.message}\n`);
+                break;
+            case "agent_msg_chunk":
+                if (startMsg) {
+                    process_1.stdout.write("[AGENT]: ");
+                    startMsg = false;
+                }
+                process_1.stdout.write(msg.message);
+                if (msg.end) {
+                    process_1.stdout.write("\n");
+                    startMsg = true;
+                }
+                break;
+            default:
+                process_1.stdout.write(`(${JSON.stringify(msg)})\n`);
+                break;
+        }
+    };
+}
+async function runScript(host, port, apiKey, session, agentProfile, script) {
+    const client = await client_1.ChatClient.init(host, port, apiKey, getCLIOnMessage(), () => { }, session, agentProfile);
+    const scriptData = fs.readFileSync(script, "utf8");
+    const lines = scriptData.split("\n");
+    for (const line of lines) {
+        await new Promise((r) => setTimeout(r, 1000));
+        client.sendMessage({ type: "msg", message: line });
+    }
+    // 2 second wait period
+    await new Promise((r) => setTimeout(r, 2000));
+    client.close();
+    return;
+}
+async function runClientTest(host, port, apiKey, session) {
+    const client = await client_1.ChatClient.init(host, port, apiKey, getCLIOnMessage(), () => { }, session);
+    for (let i = 1; i <= 60; i++) {
+        await new Promise((r) => setTimeout(r, 1000));
+        const message = {
+            type: "msg",
+            message: `add ${i} and ${i + 1}`,
+        };
+        client.sendMessage(message);
+    }
+    client.close();
+}
+exports.chatMain = (0, cmd_ts_1.subcommands)({
+    name: "chat",
+    cmds: {
+        server,
+        client,
+    },
+});

package/dist/agent/src/tool/main.js

@@ -0,0 +1,54 @@
+#!/usr/bin/env node
+"use strict";
+// -*- typescript -*-
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const dotenv = __importStar(require("dotenv"));
+const cmd_ts_1 = require("cmd-ts");
+const chatMain_1 = require("./chatMain");
+const agentMain_1 = require("./agentMain");
+dotenv.config();
+const main = (0, cmd_ts_1.subcommands)({
+    name: "chat",
+    cmds: {
+        agent: agentMain_1.agentMain,
+        chat: chatMain_1.chatMain,
+    },
+});
+function handleError(msg) {
+    console.error(msg);
+    process.exit(1);
+}
+(0, cmd_ts_1.run)(main, process.argv.slice(2)).catch(handleError);

package/dist/{options.js → agent/src/tool/options.js}

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.llmUrl = exports.llmApiKey = exports.approveToolsUpTo = exports.approveTools = exports.oneShot = exports.llmModel = exports.systemPromptFile = exports.imageFile = exports.promptFile = void 0;
+exports.pidFile = exports.supabaseKey = exports.supabaseUrl = exports.apiKey = exports.xmcpUrl = exports.llmUrl = exports.llmApiKey = exports.approveToolsUpTo = exports.approveTools = exports.oneShot = exports.llmModel = exports.systemPromptFile = exports.imageFile = exports.promptFile = void 0;
 exports.secretOption = secretOption;
 const cmd_ts_1 = require("cmd-ts");
-const agentUtils_1 = require("./agentUtils");
+const agentUtils_1 = require("../agent/agentUtils");
+const db_1 = require("../chat/db");
 /// Prevents env content from being displayed in the help text.
 function secretOption({ long, short, env, description, }) {
     if (env) {
@@ -77,3 +78,36 @@ exports.llmUrl = (0, cmd_ts_1.option)({
     env: "LLM_URL",
     defaultValue: () => agentUtils_1.DEFAULT_LLM_URL,
 });
+exports.xmcpUrl = (0, cmd_ts_1.option)({
+    type: cmd_ts_1.string,
+    long: "xmcp-url",
+    description: "XMCP URL (OpenAI compatible)",
+    env: "XMCP_URL",
+    defaultValue: () => "http://localhost:5001/",
+});
+exports.apiKey = (0, cmd_ts_1.option)({
+    type: (0, cmd_ts_1.optional)(cmd_ts_1.string),
+    long: "api-key",
+    short: "k",
+    description: "API key",
+    env: "API_KEY",
+});
+exports.supabaseUrl = (0, cmd_ts_1.option)({
+    type: cmd_ts_1.string,
+    long: "supabase-url",
+    description: "Supabase URL",
+    env: "SUPABASE_URL",
+    defaultValue: () => db_1.SUPABASE_LOCAL_URL,
+});
+exports.supabaseKey = (0, cmd_ts_1.option)({
+    type: cmd_ts_1.string,
+    long: "supabase-key",
+    description: "Supabase Key",
+    env: "SUPABASE_KEY",
+    defaultValue: () => db_1.SUPABASE_LOCAL_KEY,
+});
+exports.pidFile = (0, cmd_ts_1.option)({
+    type: (0, cmd_ts_1.optional)(cmd_ts_1.string),
+    long: "pid-file",
+    description: "write pid file",
+});

package/dist/agent/src/utils/asyncLock.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncLock = void 0;
+const assert_1 = require("assert");
+/**
+ * Support awaiting exclusive access to a resource.
+ */
+class AsyncLock {
+    constructor() {
+        this.running = false;
+        this.callbacks = [];
+    }
+    lockAndProcess(cb) {
+        return new Promise((r, e) => {
+            this.callbacks.push(async () => {
+                try {
+                    const result = await cb();
+                    r(result);
+                }
+                catch (err) {
+                    e(err);
+                }
+            });
+            if (!this.running) {
+                this.run();
+            }
+        });
+    }
+    async run() {
+        (0, assert_1.strict)(!this.running);
+        this.running = true;
+        while (this.callbacks.length > 0) {
+            const cb = this.callbacks.shift();
+            (0, assert_1.strict)(cb);
+            try {
+                await cb();
+            }
+            catch (e) {
+                (0, assert_1.strict)(false, `errors should not propagate: ${e}`);
+            }
+        }
+        this.running = false;
+    }
+}
+exports.AsyncLock = AsyncLock;

package/dist/supabase/database.types.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Constants = void 0;
+exports.Constants = {
+    public: {
+        Enums: {},
+    },
+};

package/eslint.config.mjs

@@ -1,25 +1,25 @@
-import eslint from '@eslint/js';
-import tseslint from 'typescript-eslint';
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
 
 export default tseslint.config(
   eslint.configs.recommended,
   tseslint.configs.recommended,
   {
-    "rules": {
+    rules: {
       "@typescript-eslint/no-unused-vars": [
         "error",
         {
-          "args": "all",
-          "argsIgnorePattern": "^_",
-          "caughtErrors": "all",
-          "caughtErrorsIgnorePattern": "^_",
-          "destructuredArrayIgnorePattern": "^_",
-          "varsIgnorePattern": "^_",
-          "ignoreRestSiblings": true
-        }
+          args: "all",
+          argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+          ignoreRestSiblings: true,
+        },
       ],
       "max-len": ["error", { code: 80 }],
-      "linebreak-style": ["error", "unix"]
-    }
-  }
+      "linebreak-style": ["error", "unix"],
+    },
+  },
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xalia/agent",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -9,34 +9,28 @@
     "node": ">=20.0.0"
   },
   "bin": {
-    "agent": "dist/main.js"
+    "agent": "dist/agent/src/tool/main.js"
   },
   "scripts": {
-    "build": "tsc && node -e \"require('fs').chmodSync('dist/main.js', '755')\"",
+    "build": "tsc && node -e \"require('fs').chmodSync('dist/agent/src/tool/main.js', '755')\"",
     "lint": "eslint src && yarn prettier --check src/**/*.ts",
     "format": "yarn prettier --write src/**/*.ts",
-    "test": "yarn --emoji false build && mocha dist/test/**.js --reporter-option maxDiffSize=0"
+    "test": "yarn --emoji false build && mocha dist/agent/src/test/**.js --reporter-option maxDiffSize=0"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "=1.11.1",
+    "@supabase/supabase-js": "2.49.7",
     "@types/readline-sync": "^1.4.8",
     "chalk": "^4.1.2",
     "cmd-ts": "^0.13.0",
     "dotenv": "^16.5.0",
     "openai": "=4.98.0",
     "readline-sync": "^1.4.10",
-    "yocto-spinner": "^0.2.2"
+    "uuid": "^11.1.0",
+    "yocto-spinner": "^0.2.2",
+    "ws": "8.18.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.24.0",
-    "@types/chai": "^4.0.0",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^22.13.9",
-    "chai": "^4.0.0",
-    "eslint": "^9.24.0",
-    "mocha": "^11.1.0",
-    "prettier": "3.5.3",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.29.1"
+    "@types/ws": "^8.18.0"
   }
 }

package/scripts/test_chat

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+# Assumes backend and DB are already running
+
+. ../mcppro/env/bin/activate
+
+set -x
+set -e
+
+
+yarn
+yarn build
+agent=`realpath dist/agent/src/tool/main.js`
+client=`realpath ../client/dist/src/tool/main.js`
+
+function stop_server() {
+    if [ -e chat.pid ] ; then
+         kill `cat chat.pid` || echo -n
+    fi
+}
+
+stop_server
+
+LOG_LEVEL=debug ${agent} chat server --pid-file chat.pid > chat_server.log 2>&1 &
+sleep 1
+
+mkdir -p _test_chat
+pushd _test_chat
+
+  echo "XMCP_ADMIN_SECRET=admin_secret" > .env
+
+  # Create 2 users and give them api keys
+
+  ${client} user get chatuser0 || \
+      mcppro dev add-user chatuser0 chatuser0@users.com "Europe/London"
+  ${client} user get chatuser1 || \
+      mcppro dev add-user chatuser1 chatuser1@users.com "UTC"
+
+  apikey0=`${client} admin get-api-keys chatuser0 | jq -r .default.api_key`
+  if [ "null" == "${apikey0}" ] ; then
+      apikey0=`${client} admin create-api-key chatuser0 default [] | jq -r .api_key`
+  fi
+  apikey1=`${client} admin get-api-keys chatuser1 | jq -r .default.api_key`
+  if [ "null" == "${apikey1}" ] ; then
+      apikey1=`${client} admin create-api-key chatuser1 default [] | jq -r .api_key`
+  fi
+
+  echo "${apikey0}" > chatuser0.apikey
+  echo "${apikey1}" > chatuser1.apikey
+
+  # User 0 creates an agent profile
+
+  echo '{"system_prompt":"You are a helpful agent talking to multiple users.  Users put their name at the beginning of their messages, e.g. `chatuser1: <message>`.","mcp_settings":{"duckduckgo-search":[]}}' > profile0.json
+  ${client} config --force --dev --api-key ${apikey0}
+  ${client} agent-profile set profile0 --profile profile0.json
+
+  # User 0 creates a session and asks for a joke
+
+  echo 'tell me a joke' > script0
+  ${agent} chat client --session test_session --agent-profile profile0 --script script0
+
+  # Run both clients with a script that continues the conversation
+
+  echo -e "why is that funny?\ntell me another.\nwhat is my name?\nhow old are you?\nwhere are your parents?" > script1
+  ${agent} chat client --session chatuser0/test_session --api-key ${apikey1} --script script1 >chatuser1.output &
+  ${agent} chat client --session chatuser0/test_session --script script1
+
+  # The name chatuser0 should appear in chatuser1's session output
+
+  if ! (grep chatuser0 chatuser1.output) ; then
+      echo "error: expected chatuser0 in chatuser1's output"
+      exit 1
+  fi
+
+popd
+
+stop_server
+
+set +e
+set +x
+
+echo "============================"
+echo "==    CHAT TEST PASSED    =="
+echo "============================"

package/src/{agent.ts → agent/agent.ts}

@@ -14,6 +14,11 @@ export type ToolHandler = (args: unknown) => string;
 
 export type McpServerUrls = (name: string) => string;
 
+export type ChatCompletionMessageParam = OpenAI.ChatCompletionMessageParam;
+
+export type ChatCompletionMessageToolCall =
+  OpenAI.ChatCompletionMessageToolCall;
+
 // Role: If content, give it to UI
 export type OnMessageCB = {
   (msg: string, msgEnd: boolean): Promise<void>;
@@ -21,7 +26,7 @@ export type OnMessageCB = {
 
 // Role: If tool calls, prompt for permission to handle them
 export type OnToolCallCB = {
-  (msg: OpenAI.ChatCompletionMessageToolCall): Promise<boolean>;
+  (msg: ChatCompletionMessageToolCall): Promise<boolean>;
 };
 
 dotenv.config();
@@ -33,7 +38,7 @@ export class Agent {
   private constructor(
     public onMessage: OnMessageCB,
     public onToolCall: OnToolCallCB,
-    private messages: OpenAI.ChatCompletionMessageParam[],
+    private messages: ChatCompletionMessageParam[],
     private mcpServerManager: McpServerManager,
     private tools: OpenAI.ChatCompletionTool[],
     private llm: ILLM
@@ -78,7 +83,7 @@ export class Agent {
     );
   }
 
-  public getConversation(): OpenAI.ChatCompletionMessageParam[] {
+  public getConversation(): ChatCompletionMessageParam[] {
     assert(
       this.messages[0].role == "system",
       "first message must have system role"
@@ -88,11 +93,14 @@ export class Agent {
     return structuredClone(this.messages.slice(1));
   }
 
-  public setConversation(messages: OpenAI.ChatCompletionMessageParam[]) {
+  public setConversation(messages: ChatCompletionMessageParam[]) {
     assert(this.messages[0].role == "system");
-    assert(messages[0].role != "system", "conversation contains system msg");
+    assert(
+      messages.length === 0 || messages[0].role != "system",
+      "conversation contains system msg"
+    );
 
-    const newMessages: OpenAI.ChatCompletionMessageParam[] = [this.messages[0]];
+    const newMessages: ChatCompletionMessageParam[] = [this.messages[0]];
     this.messages = newMessages.concat(structuredClone(messages));
   }
 
@@ -102,9 +110,10 @@ export class Agent {
 
   public async userMessage(
     msg?: string,
-    imageB64?: string
-  ): Promise<OpenAI.ChatCompletionMessageParam | undefined> {
-    const userMessage = createUserMessage(msg, imageB64);
+    imageB64?: string,
+    name?: string
+  ): Promise<ChatCompletionMessageParam | undefined> {
+    const userMessage = createUserMessage(msg, imageB64, name);
     if (!userMessage) {
       return undefined;
     }
@@ -216,7 +225,7 @@ export class Agent {
   }
 
   async doToolCall(
-    toolCall: OpenAI.ChatCompletionMessageToolCall
+    toolCall: ChatCompletionMessageToolCall
   ): Promise<OpenAI.ChatCompletionToolMessageParam> {
     const name = toolCall.function.name;
     const args = JSON.parse(toolCall.function.arguments);
@@ -244,7 +253,8 @@ export class Agent {
  **/
 export function createUserMessage(
   msg?: string,
-  imageB64?: string
+  imageB64?: string,
+  name?: string
 ): ChatCompletionUserMessageParam | undefined {
   const content = (() => {
     if (!imageB64) {
@@ -279,5 +289,6 @@ export function createUserMessage(
   return {
     role: "user",
     content,
+    name,
   };
 }