@xalia/agent 0.5.0 → 0.5.2

package/src/{chat.ts → tool/agentChat.ts}

@@ -1,17 +1,20 @@
 import yocto from "yocto-spinner";
 import { Spinner } from "yocto-spinner";
 import * as fs from "fs";
-import { Agent, AgentProfile } from "./agent";
-import { displayToolCall } from "./tools";
-import { McpServerManager } from "./mcpServerManager";
 import OpenAI from "openai";
-import { loadImageB64OrUndefined } from "./files";
-import { Prompt, parsePrompt } from "./prompt";
-import { SudoMcpServerManager } from "./sudoMcpServerManager";
 import chalk from "chalk";
+
 import { configuration, utils } from "@xalia/xmcp/tool";
 import { getLogger, InvalidConfiguration } from "@xalia/xmcp/sdk";
-import { createAgentAndSudoMcpServerManager } from "./agentUtils";
+
+import { Agent, AgentProfile } from "../agent/agent";
+import { McpServerManager } from "../agent/mcpServerManager";
+import { displayToolCall } from "../agent/tools";
+import { SkillManager } from "../agent/sudoMcpServerManager";
+import { createAgentWithSkills } from "../agent/agentUtils";
+
+import { loadImageB64OrUndefined } from "./files";
+import { Prompt, parsePrompt } from "./prompt";
 import { NODE_PLATFORM } from "./nodePlatform";
 
 const logger = getLogger();
@@ -78,19 +81,18 @@ export async function runChat(
 
   // Create agent
 
-  const [agent, sudoMcpServerManager] =
-    await createAgentAndSudoMcpServerManager(
-      llmUrl,
-      agentProfile,
-      onMessage,
-      onToolCall,
-      NODE_PLATFORM,
-      llmApiKey,
-      sudomcpConfig,
-      utils.FRONTEND_PROD_AUTHORIZED_URL,
-      undefined,
-      stream
-    );
+  const [agent, sudoMcpServerManager] = await createAgentWithSkills(
+    llmUrl,
+    agentProfile,
+    onMessage,
+    onToolCall,
+    NODE_PLATFORM,
+    llmApiKey,
+    sudomcpConfig,
+    utils.FRONTEND_PROD_AUTHORIZED_URL,
+    undefined,
+    stream
+  );
   if (conversation) {
     agent.setConversation(conversation);
   }
@@ -148,7 +150,7 @@ export async function runChat(
 async function getNextPrompt(
   repl: Prompt,
   agent: Agent,
-  sudoMcpServerManager: SudoMcpServerManager
+  sudoMcpServerManager: SkillManager
 ): Promise<[string | undefined, string | undefined]> {
   while (true) {
     // Get a line, detecting the EOF signal.
@@ -199,7 +201,7 @@ async function getNextPrompt(
 async function runCommand(
   agent: Agent,
   mcpServerManager: McpServerManager,
-  sudoMcpServerManager: SudoMcpServerManager,
+  sudoMcpServerManager: SkillManager,
   cmds: string[]
 ) {
   switch (cmds[0]) {
@@ -289,7 +291,7 @@ function listTools(mcpServerManager: McpServerManager) {
   }
 }
 
-function listServers(sudoMcpServerManager: SudoMcpServerManager) {
+function listServers(sudoMcpServerManager: SkillManager) {
   console.log(`Available MCP Servers:`);
 
   const serverBriefs = sudoMcpServerManager.getServerBriefs();
@@ -303,7 +305,7 @@ function listServers(sudoMcpServerManager: SudoMcpServerManager) {
  * Adds server and enables all tools.
  */
 async function addServer(
-  sudoMcpServerManager: SudoMcpServerManager,
+  sudoMcpServerManager: SkillManager,
   serverName: string
 ) {
   try {

package/src/{main.ts → tool/agentMain.ts}

@@ -1,10 +1,15 @@
-#!/usr/bin/env node
-// -*- typescript -*-
-
 import * as fs from "fs";
 import * as dotenv from "dotenv";
-import { run, command, option, flag, optional, string } from "cmd-ts";
-import { AgentProfile } from "./agent";
+import { command, option, flag, optional, string } from "cmd-ts";
+import OpenAI from "openai";
+import { strict as assert } from "assert";
+
+import { configuration, utils } from "@xalia/xmcp/tool";
+import { getLogger } from "@xalia/xmcp/sdk";
+
+import { AgentProfile } from "../agent/agent";
+import { runOneShot } from "../agent/agentUtils";
+
 import {
   llmUrl,
   llmApiKey,
@@ -14,24 +19,19 @@ import {
   approveToolsUpTo,
   imageFile,
 } from "./options";
-import OpenAI from "openai";
 import {
   loadFileOrUndefined,
   loadFileOrStdin,
   loadImageB64OrUndefined,
 } from "./files";
-import { configuration, utils } from "@xalia/xmcp/tool";
-import { getLogger } from "@xalia/xmcp/sdk";
-import { runOneShot } from "./agentUtils";
-import { runChat } from "./chat";
+import { runChat } from "./agentChat";
 import { NODE_PLATFORM } from "./nodePlatform";
-import { strict as assert } from "assert";
 
 dotenv.config();
 
 const logger = getLogger();
 
-const main = command({
+export const agentMain = command({
   name: "main",
   args: {
     promptFile,
@@ -178,10 +178,3 @@ const main = command({
     }
   },
 });
-
-function handleError(msg: string) {
-  console.error(msg);
-  process.exit(1);
-}
-
-run(main, process.argv.slice(2)).catch(handleError);

package/src/tool/chatMain.ts

@@ -0,0 +1,250 @@
+import {
+  command,
+  optional,
+  option,
+  flag,
+  string,
+  number,
+  subcommands,
+} from "cmd-ts";
+import { stdout } from "process";
+import * as fs from "fs";
+
+import { configuration } from "@xalia/xmcp/tool";
+import { getLogger } from "@xalia/xmcp/sdk";
+
+import { ChatClient } from "../chat/client";
+import { runServer } from "../chat/server";
+import { ClientUserMessage, ServerToClient } from "../chat/messages";
+
+import { Prompt } from "./prompt";
+import * as options from "./options";
+
+const logger = getLogger();
+
+const server = command({
+  name: "server",
+  args: {
+    port: option({
+      type: 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,
+  }): Promise<void> => {
+    if (pidFile) {
+      fs.writeFileSync(pidFile, process.pid.toString());
+    }
+
+    runServer(port, supabaseUrl, supabaseKey, llmUrl, xmcpUrl);
+  },
+});
+
+const client = command({
+  name: "client",
+  args: {
+    host: option({
+      type: string,
+      long: "host",
+      short: "h",
+      env: "CHAT_SERVER_HOST",
+      defaultValue: () => "localhost",
+    }),
+    port: option({
+      type: number,
+      long: "port",
+      short: "p",
+      env: "CHAT_SERVER_PORT",
+      defaultValue: () => 5003,
+    }),
+    apiKey: options.apiKey,
+    session: option({
+      type: string,
+      long: "session",
+      description: "Session identifier (id, name, user/name)",
+      env: "SESSION",
+    }),
+    agentProfile: option({
+      type: optional(string),
+      long: "agent-profile",
+      description: "Create new session using agent profile (id, name)",
+      env: "AGENT_PROFILE",
+    }),
+    script: option({
+      type: optional(string),
+      long: "script",
+      description: "Script (file) to execute and then exit.",
+    }),
+    test: flag({
+      long: "test",
+      description: "Run a test client and disconnect",
+    }),
+  },
+  handler: async ({
+    host,
+    port,
+    apiKey,
+    session,
+    agentProfile,
+    script,
+    test,
+  }): Promise<void> => {
+    if (!apiKey) {
+      // TODO: configFIle param list in ../main.ts
+      const sudomcpConfig = 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();
+    const client = await 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: ClientUserMessage = {
+          type: "msg",
+          message: msgText,
+        };
+        client.sendMessage(msg);
+      } else {
+        logger.debug("(ignoring empty message)");
+      }
+    }
+  },
+});
+
+function getCLIOnMessage(): (msg: ServerToClient) => void {
+  let startMsg = true;
+  return (msg: ServerToClient) => {
+    switch (msg.type) {
+      case "user_msg":
+        stdout.write(`[${msg.from}]: ${msg.message}\n`);
+        break;
+      case "agent_msg":
+        stdout.write(`[AGENT]: ${msg.message}\n`);
+        break;
+      case "agent_msg_chunk":
+        if (startMsg) {
+          stdout.write("[AGENT]: ");
+          startMsg = false;
+        }
+        stdout.write(msg.message);
+        if (msg.end) {
+          stdout.write("\n");
+          startMsg = true;
+        }
+        break;
+      default:
+        stdout.write(`(${JSON.stringify(msg)})\n`);
+        break;
+    }
+  };
+}
+
+async function runScript(
+  host: string,
+  port: number,
+  apiKey: string,
+  session: string,
+  agentProfile: string | undefined,
+  script: string
+): Promise<void> {
+  const client = await 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: string,
+  port: number,
+  apiKey: string,
+  session: string
+): Promise<void> {
+  const client = await ChatClient.init(
+    host,
+    port,
+    apiKey,
+    getCLIOnMessage(),
+    () => {},
+    session
+  );
+
+  for (let i = 1; i <= 60; i++) {
+    await new Promise((r) => setTimeout(r, 1000));
+
+    const message: ClientUserMessage = {
+      type: "msg",
+      message: `add ${i} and ${i + 1}`,
+    };
+    client.sendMessage(message);
+  }
+
+  client.close();
+}
+
+export const chatMain = subcommands({
+  name: "chat",
+  cmds: {
+    server,
+    client,
+  },
+});

package/src/{files.ts → tool/files.ts}

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import * as path from "path";
-import { McpServerUrls } from "./agent";
+import { McpServerUrls } from "../agent/agent";
 
 export function loadFileOrUndefined(
   file: string | undefined

package/src/tool/main.ts

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+// -*- typescript -*-
+
+import * as dotenv from "dotenv";
+import { run, subcommands } from "cmd-ts";
+
+import { chatMain } from "./chatMain";
+import { agentMain } from "./agentMain";
+
+dotenv.config();
+
+const main = subcommands({
+  name: "chat",
+  cmds: {
+    agent: agentMain,
+    chat: chatMain,
+  },
+});
+
+function handleError(msg: string) {
+  console.error(msg);
+  process.exit(1);
+}
+
+run(main, process.argv.slice(2)).catch(handleError);

package/src/{nodePlatform.ts → tool/nodePlatform.ts}

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import { execSync } from "child_process";
-import { IPlatform } from "./iplatform";
+import { IPlatform } from "../agent/iplatform";
 
 /**
  * Implementation of the IPlatform interface for node.js

package/src/{options.ts → tool/options.ts}

@@ -1,7 +1,8 @@
 import { boolean, option, optional, string, flag, number } from "cmd-ts";
 import { ArgParser } from "cmd-ts/dist/cjs/argparser";
 import { Descriptive, ProvidesHelp } from "cmd-ts/dist/cjs/helpdoc";
-import { DEFAULT_LLM_URL } from "./agentUtils";
+import { DEFAULT_LLM_URL } from "../agent/agentUtils";
+import { SUPABASE_LOCAL_KEY, SUPABASE_LOCAL_URL } from "../chat/db";
 
 export type Option = ReturnType<typeof option>;
 export type OptionalOption = ArgParser<string | undefined> &
@@ -101,3 +102,41 @@ export const llmUrl = option({
   env: "LLM_URL",
   defaultValue: () => DEFAULT_LLM_URL,
 });
+
+export const xmcpUrl = option({
+  type: string,
+  long: "xmcp-url",
+  description: "XMCP URL (OpenAI compatible)",
+  env: "XMCP_URL",
+  defaultValue: () => "http://localhost:5001/",
+});
+
+export const apiKey = option({
+  type: optional(string),
+  long: "api-key",
+  short: "k",
+  description: "API key",
+  env: "API_KEY",
+});
+
+export const supabaseUrl = option({
+  type: string,
+  long: "supabase-url",
+  description: "Supabase URL",
+  env: "SUPABASE_URL",
+  defaultValue: () => SUPABASE_LOCAL_URL,
+});
+
+export const supabaseKey = option({
+  type: string,
+  long: "supabase-key",
+  description: "Supabase Key",
+  env: "SUPABASE_KEY",
+  defaultValue: () => SUPABASE_LOCAL_KEY,
+});
+
+export const pidFile = option({
+  type: optional(string),
+  long: "pid-file",
+  description: "write pid file",
+});

package/src/utils/asyncLock.ts

@@ -0,0 +1,43 @@
+import { strict as assert } from "assert";
+
+/**
+ * Support awaiting exclusive access to a resource.
+ */
+export class AsyncLock {
+  private running: boolean = false;
+  private callbacks: (() => Promise<void>)[] = [];
+
+  lockAndProcess<T>(cb: () => Promise<T>): Promise<T> {
+    return new Promise<T>((r, e) => {
+      this.callbacks.push(async () => {
+        try {
+          const result = await cb();
+          r(result);
+        } catch (err) {
+          e(err);
+        }
+      });
+
+      if (!this.running) {
+        this.run();
+      }
+    });
+  }
+
+  private async run() {
+    assert(!this.running);
+    this.running = true;
+
+    while (this.callbacks.length > 0) {
+      const cb = this.callbacks.shift();
+      assert(cb);
+      try {
+        await cb();
+      } catch (e) {
+        assert(false, `errors should not propagate: ${e}`);
+      }
+    }
+
+    this.running = false;
+  }
+}

package/test_data/simplecalc_profile.json

@@ -1,4 +1,4 @@
 {
   "system_prompt": "You are a helpful agent",
-  "mcp_settings": {"sudomcp_simplecalc":["divide"]}
+  "mcp_settings": { "sudomcp_simplecalc": ["divide"] }
 }

package/test_data/sudomcp_import_profile.json

@@ -1,4 +1,4 @@
 {
   "system_prompt": "Your job is to parse the public README of an mcp server code repository and extract the commands to run the server. You must then create a yaml \"sudomcp\" spec of the form:\n```\nname: mongodb-local\ntitle: MongoDB Local\ndescription: Interact with a local MongoDB instance (via connection string)\nlogo_url: \"https://github.com/sudobase-ai/mcp-servers/blob/master/mongodb-local/logo.png?raw=true\"\nconfig_schema:\n  connection_string:\n    type: string\n    default: \"mongodb://localhost\"\nstdio_server_params:\n  command: \"npx\"\n  args:\n    - \"-y\"\n    - \"mongodb-mcp-server\"\n  env:\n    MDB_MCP_CONNECTION_STRING: $connection_string\n```\nThe above is for a mongodb MCP server, requiring an environment variable `MDB_MCP_CONNECTION_STRING`. The `config_schema` section determines the variables that are required from the user in order to populate the `args` or the `env` values. Each server will have its own configuration requirements and some servers will not require a `config_schema` section at all.  The use of \"mcp\" in the name, title and description is redundant and should be avoided.\n\nDo not explain any intermediate steps or give any justification.  Just output the yaml file directly so I can pipe it to a file.  No ``` or similar notation.\n\n",
-  "mcp_settings": {"duckduckgo-search":["fetch_content"]}
+  "mcp_settings": { "duckduckgo-search": ["fetch_content"] }
 }

package/test_data/test_script_profile.json

@@ -3,6 +3,6 @@
   "model": "dummy:test_data/dummyllm_script_simplecalc.json",
   "system_prompt": "You are a helpful agent",
   "mcp_settings": {
-    "sudomcp_simplecalc":["add","divide"]
+    "sudomcp_simplecalc": ["add", "divide"]
   }
 }

package/tsconfig.json

@@ -9,5 +9,5 @@
     "strict": true,
     "esModuleInterop": true
   },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts"]
 }

package/scripts/test_script

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-. env/bin/activate
-make dev-setup
-
-# Build client
-
-pushd ../client
-yarn
-yarn build
-client=`realpath dist/src/tool/main.js`
-popd
-
-# Build agent
-yarn
-yarn build
-agent=`realpath dist/main.js`
-
-set -x
-set -e
-
-# Start server
-
-pushd ../mcppro
-
-function stop_server() {
-    if [ -e sudomcp.pid ] ; then
-         kill `cat sudomcp.pid` || echo -n
-    fi
-}
-
-if [ -z ${NO_START} ] ; then
-    stop_server
-    make start-dev > server.log 2>&1 &
-    sleep 5
-fi
-
-[ -n "${URL}" ] || URL=http://localhost:5001
-
-# enable agent logging
-export LOG_LEVEL=DEBUG
-LOG_FILE="agent.log"
-rm -f $LOG_FILE && touch $LOG_FILE
-export LOG_FILE=`realpath $LOG_FILE`
-
-# list mcp servers
-${client} config -f --dev --server-url ${URL}
-${client} server list
-
-if [ -z ${NO_START} ] ; then
-    stop_server
-    # cat server.log
-fi
-
-set +e
-set +x
-
-echo "=============================="
-echo "==  MCP Agent TEST PASSED   =="
-echo "=============================="