@xalia/agent 0.5.3 → 0.5.5

package/dist/agent/src/chat/db.js

@@ -41,10 +41,21 @@ class Database {
             return undefined;
         }
         return {
-            user_uuid: data.user_uuid,
+            uuid: data.user_uuid,
             nickname: data.users.nickname || `user ${data.user_uuid}`,
         };
     }
+    async getUserFromUuid(user_uuid) {
+        const { data, error } = await this.client
+            .from("users")
+            .select("*")
+            .eq("uuid", user_uuid)
+            .maybeSingle();
+        if (error) {
+            throw error;
+        }
+        return data;
+    }
     async createUser(user_uuid, email, nickname, timezone) {
         const payload = {
             uuid: user_uuid,
@@ -133,6 +144,18 @@ class Database {
         }
         return data[0].uuid;
     }
+    async updateAgentProfile(uuid, profile) {
+        const payload = {
+            profile: profile,
+        };
+        const { error } = await this.client
+            .from("agent_profiles")
+            .update(payload)
+            .eq("uuid", uuid);
+        if (error) {
+            throw error;
+        }
+    }
     async clearAgentProfiles() {
         await this.client.from("agent_profiles").delete().neq("uuid", "");
     }

package/dist/agent/src/chat/frontendClient.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FrontendChatClient = void 0;
+class FrontendChatClient {
+    constructor(ws, onMessageCB, onConnectionClosedCB) {
+        this.ws = ws;
+        this.onMessageCB = onMessageCB;
+        this.onConnectionClosedCB = onConnectionClosedCB;
+        this.closed = false;
+    }
+    static async initWithParams(host, port, token, params, onMessageCB, onConnectionClosedCB) {
+        return new Promise((resolve, reject) => {
+            const urlParams = new URLSearchParams(params);
+            const url = `ws://${host}:${port}?${urlParams}`;
+            const ws = new WebSocket(url, [token]);
+            console.log("created ws");
+            const client = new FrontendChatClient(ws, onMessageCB, onConnectionClosedCB);
+            ws.onopen = async () => {
+                console.log("opened");
+                ws.onmessage = (ev) => {
+                    try {
+                        const msgData = ev.data;
+                        if (typeof msgData !== "string") {
+                            throw `expected "string" data, got ${typeof msgData}`;
+                        }
+                        console.debug(`[client.onmessage]: ${msgData}`);
+                        const msg = JSON.parse(msgData);
+                        client.onMessageCB(msg);
+                    }
+                    catch (e) {
+                        client.close();
+                        throw e;
+                    }
+                };
+                resolve(client);
+            };
+            ws.onclose = (event) => {
+                console.log("closed");
+                console.log(`[client] WebSocket connection closed: ${JSON.stringify(event)}`);
+                client.closed = true;
+                onConnectionClosedCB();
+            };
+            ws.onerror = (error) => {
+                console.error("[client] WebSocket error:", error);
+                reject(error);
+                client.closed = true;
+                onConnectionClosedCB();
+            };
+        });
+    }
+    static async init(host, port, token, onMessageCB, onConnectionClosedCB, sessionId = "untitled", agentProfileId = undefined) {
+        const params = { session_id: sessionId };
+        if (agentProfileId) {
+            params["agent_profile_id"] = agentProfileId;
+        }
+        return FrontendChatClient.initWithParams(host, port, token, params, onMessageCB, onConnectionClosedCB);
+    }
+    sendMessage(message) {
+        if (this.closed) {
+            throw new Error("Cannot send message on closed connection");
+        }
+        const data = JSON.stringify(message);
+        this.ws.send(data);
+    }
+    close() {
+        this.closed = true;
+        this.onConnectionClosedCB();
+        this.ws.close();
+    }
+    isClosed() {
+        return this.closed;
+    }
+}
+exports.FrontendChatClient = FrontendChatClient;

package/dist/agent/src/chat/server.js

@@ -54,7 +54,7 @@ async function resolveAgentProfileId(db, userData, agentProfileIdentifier) {
     if (ap) {
         return agentProfileIdentifier;
     }
-    ap = await db.getSavedAgentProfileByName(userData.user_uuid, agentProfileIdentifier);
+    ap = await db.getSavedAgentProfileByName(userData.uuid, agentProfileIdentifier);
     logger.debug(`[resolveAgentProfileId]: by name: {JSON.stringify(ap)}`);
     if (ap) {
         return ap.uuid;
@@ -69,7 +69,7 @@ async function resolveSessionIdFromIdentifier(db, userData, sessionIdentifier) {
         // Interpret as an id, or as a number under the current user.
         session = await db.getSessionById(compound);
         if (!session) {
-            session = await db.getSessionByName(userData.user_uuid, compound);
+            session = await db.getSessionByName(userData.uuid, compound);
         }
     }
     else {
@@ -110,7 +110,7 @@ async function findOrCreateSession(db, userData, query) {
     if (!agentProfileId) {
         throw `no agent profile: ${agentProfileIdParam}`;
     }
-    return db.createSession(userData.user_uuid, query.session_id, agentProfileId);
+    return db.createSession(userData.uuid, query.session_id, agentProfileId);
 }
 async function runServer(port, supabaseUrl, supabaseKey, llmUrl, xmcpUrl) {
     return new Promise((r, _e) => {

package/dist/agent/src/test/db.test.js

@@ -13,6 +13,11 @@ const AGENT_PROFILE = {
     system_prompt: "You are an unhelpful agent",
     mcp_settings: {},
 };
+const AGENT_PROFILE_2 = {
+    model: undefined,
+    system_prompt: "You are a very helpful agent.",
+    mcp_settings: { simplecalc: [] },
+};
 async function createDummyUser(db) {
     const apiClient = new sdk_1.ApiClient(sudoMcpServerManager_1.LOCAL_SERVER_URL, "dummy_key");
     const user = await apiClient.getUserBrief("dummy_user");
@@ -25,12 +30,12 @@ async function createDummyUser(db) {
     }
 }
 describe("DB", () => {
-    it("should get existing user", async function () {
+    it("should get data for existing user", async function () {
         const db = getLocalDB();
         await createDummyUser(db);
         const dummyUser = await db.getUserDataFromApiKey("dummy_key");
         (0, chai_1.expect)(dummyUser).eql({
-            user_uuid: "dummy_user",
+            uuid: "dummy_user",
             nickname: "Dummy User",
         });
     });
@@ -39,6 +44,14 @@ describe("DB", () => {
         const dummyUser = await db.getUserDataFromApiKey("no_such_key");
         (0, chai_1.expect)(dummyUser).to.equal(undefined);
     });
+    it("should get user by uuid", async function () {
+        const db = getLocalDB();
+        await createDummyUser(db);
+        const dummyUser = await db.getUserFromUuid("dummy_user");
+        (0, assert_1.strict)(dummyUser);
+        (0, chai_1.expect)(dummyUser.uuid).eql("dummy_user");
+        (0, chai_1.expect)(dummyUser.nickname).eql("Dummy User");
+    });
     it("should create and retrieve agent profiles", async function () {
         const db = getLocalDB();
         await db.clearAgentProfiles();
@@ -55,6 +68,16 @@ describe("DB", () => {
         (0, chai_1.expect)(savedAgentProfileByName).eql(savedAgentProfile);
         (0, chai_1.expect)(agentProfile).eql(AGENT_PROFILE);
     });
+    it("should update agent profiles", async function () {
+        const db = getLocalDB();
+        await db.clearAgentProfiles();
+        const agentProfileId = await db.createAgentProfile("dummy_user", "test_profile", AGENT_PROFILE);
+        (0, chai_1.expect)(agentProfileId).to.not.equal(undefined);
+        (0, assert_1.strict)(agentProfileId);
+        await db.updateAgentProfile(agentProfileId, AGENT_PROFILE_2);
+        const agentProfileFromDB = (await db.getAgentProfileById(agentProfileId));
+        (0, chai_1.expect)(agentProfileFromDB).eql(AGENT_PROFILE_2);
+    });
     it("should create and retrieve sessions", async function () {
         const db = getLocalDB();
         await db.clearAgentProfiles();

package/dist/agent/src/test/openaiStreaming.test.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const openAILLMStreaming_1 = require("../agent/openAILLMStreaming");
+const TEST_STANDARD = [
+    {
+        id: "chatcmpl-BzBqzVs5w0kU5we3KIUN1Q4FAZXjg",
+        choices: [
+            {
+                delta: { content: "!" },
+                finish_reason: null,
+                index: 0,
+                logprobs: null,
+            },
+        ],
+        created: 1753923273,
+        model: "gpt-4o-2024-08-06",
+        object: "chat.completion.chunk",
+        service_tier: "default",
+        system_fingerprint: "fp_07871e2ad8",
+    },
+    {
+        id: "chatcmpl-BzBqzVs5w0kU5we3KIUN1Q4FAZXjg",
+        choices: [{ delta: {}, finish_reason: "stop", index: 0, logprobs: null }],
+        created: 1753923273,
+        model: "gpt-4o-2024-08-06",
+        object: "chat.completion.chunk",
+        service_tier: "default",
+        system_fingerprint: "fp_07871e2ad8",
+    },
+];
+const TEST_TRAILING_USAGE = [
+    {
+        id: "gen-1753923406-nsIKHyFRoJqkUntBnQTw",
+        choices: [
+            {
+                delta: { content: "test", role: "assistant" },
+                finish_reason: "stop",
+                index: 0,
+                logprobs: null,
+            },
+        ],
+        created: 1753923406,
+        model: "openai/gpt-4o",
+        object: "chat.completion.chunk",
+        system_fingerprint: "fp_a288987b44",
+    },
+    {
+        id: "gen-1753923406-nsIKHyFRoJqkUntBnQTw",
+        choices: [
+            {
+                delta: { content: "", role: "assistant" },
+                finish_reason: null,
+                index: 0,
+                logprobs: null,
+            },
+        ],
+        created: 1753923406,
+        model: "openai/gpt-4o",
+        object: "chat.completion.chunk",
+        usage: {
+            completion_tokens: 50,
+            prompt_tokens: 271,
+            total_tokens: 321,
+            completion_tokens_details: { reasoning_tokens: 0 },
+            prompt_tokens_details: { cached_tokens: 0 },
+        },
+    },
+];
+describe("OpenAI Streaming", () => {
+    it("should support standard termination", async function () {
+        const chunks = TEST_STANDARD;
+        (0, chai_1.expect)(chunks.length).eql(2);
+        const { initMessage } = (0, openAILLMStreaming_1.initializeCompletion)(chunks[0]);
+        (0, openAILLMStreaming_1.updateCompletion)(initMessage, chunks[1]);
+        (0, chai_1.expect)(initMessage).eql({
+            id: "chatcmpl-BzBqzVs5w0kU5we3KIUN1Q4FAZXjg",
+            choices: [
+                {
+                    message: {
+                        content: "!",
+                        role: "assistant",
+                        refusal: null,
+                        tool_calls: undefined,
+                    },
+                    finish_reason: "stop",
+                    index: 0,
+                    logprobs: null,
+                },
+            ],
+            created: 1753923273,
+            model: "gpt-4o-2024-08-06",
+            object: "chat.completion",
+            service_tier: "default",
+            system_fingerprint: "fp_07871e2ad8",
+            usage: undefined,
+        });
+    });
+    it("should support trailing usage", async function () {
+        const chunks = TEST_TRAILING_USAGE;
+        (0, chai_1.expect)(chunks.length).eql(2);
+        const { initMessage } = (0, openAILLMStreaming_1.initializeCompletion)(chunks[0]);
+        (0, openAILLMStreaming_1.updateCompletion)(initMessage, chunks[1]);
+        (0, chai_1.expect)(initMessage).eql({
+            id: "gen-1753923406-nsIKHyFRoJqkUntBnQTw",
+            choices: [
+                {
+                    message: {
+                        content: "test",
+                        role: "assistant",
+                        refusal: null,
+                        tool_calls: undefined,
+                    },
+                    finish_reason: "stop",
+                    index: 0,
+                    logprobs: null,
+                },
+            ],
+            created: 1753923406,
+            model: "openai/gpt-4o",
+            object: "chat.completion",
+            service_tier: undefined,
+            system_fingerprint: "fp_a288987b44",
+            usage: {
+                completion_tokens: 50,
+                prompt_tokens: 271,
+                total_tokens: 321,
+                completion_tokens_details: { reasoning_tokens: 0 },
+                prompt_tokens_details: { cached_tokens: 0 },
+            },
+        });
+    });
+});

package/dist/agent/src/test/prompt.test.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
-const prompt_1 = require("../tool/prompt");
+const commandPrompt_1 = require("../tool/commandPrompt");
 describe("Prompt", () => {
     it("should recognise commands", async function () {
         const expectedResults = {
@@ -19,7 +19,7 @@ describe("Prompt", () => {
             },
         };
         for (const [prompt, expected] of Object.entries(expectedResults)) {
-            const res = (0, prompt_1.parsePrompt)(prompt);
+            const res = (0, commandPrompt_1.parsePrompt)(prompt);
             (0, chai_1.expect)(res).eql(expected);
         }
     });

package/dist/agent/src/test/sudoMcpServerManager.test.js

@@ -38,7 +38,7 @@ describe("SudoMcpServerManager", async () => {
     }).timeout(10000);
     it("should add a new MCP server", async () => {
         const [, sm] = await getServerManagers();
-        await sm.addMcpServer("sudomcp_simplecalc");
+        await sm.addMcpServer("sudomcp_simplecalc", true);
         const serverBriefs = sm.getServerBriefs();
         (0, chai_1.expect)(serverBriefs.some((brief) => brief.name === "sudomcp_simplecalc")).eql(true);
     }).timeout(20000);

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

@@ -1,52 +1,18 @@
 "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;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runChat = runChat;
 const yocto_spinner_1 = __importDefault(require("yocto-spinner"));
-const fs = __importStar(require("fs"));
 const chalk_1 = __importDefault(require("chalk"));
 const tool_1 = require("@xalia/xmcp/tool");
 const sdk_1 = require("@xalia/xmcp/sdk");
-const tools_1 = require("../agent/tools");
 const agentUtils_1 = require("../agent/agentUtils");
 const files_1 = require("./files");
-const prompt_1 = require("./prompt");
 const nodePlatform_1 = require("./nodePlatform");
+const commandPrompt_1 = require("./commandPrompt");
+const prompt_1 = require("./prompt");
 const logger = (0, sdk_1.getLogger)();
 async function write(msg) {
     return new Promise((resolve, err) => {
@@ -81,6 +47,8 @@ async function runChat(llmUrl, agentProfile, conversation, prompt, image, llmApi
             first = true;
         }
     };
+    const repl = new prompt_1.Prompt();
+    const cmdPrompt = new commandPrompt_1.CommandPrompt(repl);
     let remainingApprovedToolCalls = approveToolsUpTo;
     const onToolCall = async (toolCall) => {
         if (remainingApprovedToolCalls !== 0) {
@@ -88,7 +56,7 @@ async function runChat(llmUrl, agentProfile, conversation, prompt, image, llmApi
             return true;
         }
         spinner.stop().clear();
-        const result = await promptToolCall(repl, toolCall);
+        const result = await cmdPrompt.promptToolCall(toolCall);
         spinner.start();
         return result;
     };
@@ -104,11 +72,10 @@ async function runChat(llmUrl, agentProfile, conversation, prompt, image, llmApi
     if (prompt) {
         console.log(`USER: ${prompt}`);
     }
-    const repl = new prompt_1.Prompt();
     // Conversation loop
     while (true) {
         if (!prompt) {
-            const [msg, img] = await getNextPrompt(repl, agent, sudoMcpServerManager);
+            const [msg, img] = await cmdPrompt.getNextPrompt(agent, sudoMcpServerManager);
             if (!msg && !img) {
                 break;
             }
@@ -129,7 +96,7 @@ async function runChat(llmUrl, agentProfile, conversation, prompt, image, llmApi
         image = undefined;
     }
     // Shutdown the agent
-    repl.shutdown();
+    cmdPrompt.shutdown();
     await agent.shutdown();
     logger.debug("shutdown done");
 }
@@ -137,160 +104,3 @@ async function runChat(llmUrl, agentProfile, conversation, prompt, image, llmApi
  * Read lines from the prompt, parsing any commands, and return once there is
  * a prompt and/or image for the llm.  Both undefined means exit.
  */
-async function getNextPrompt(repl, agent, sudoMcpServerManager) {
-    while (true) {
-        // Get a line, detecting the EOF signal.
-        const line = await repl.run();
-        if (typeof line === "undefined") {
-            console.log("closing ...");
-            return [undefined, undefined];
-        }
-        if (line.length === 0) {
-            continue;
-        }
-        // Extract prompt or commands
-        const { msg, cmds } = (0, prompt_1.parsePrompt)(line);
-        // If there are no commands, this must be a prompt only
-        if (!cmds) {
-            return [msg, undefined];
-        }
-        // There are commands.  If it's image, return [prompt, image].  If it's
-        // quit, return [undefined, undefined], otherwise it must be a command.
-        // Execute it and prompt again.
-        switch (cmds[0]) {
-            case "i": // image
-                return [msg, cmds[1]];
-            case "q":
-            case "quit":
-            case "exit":
-                return [undefined, undefined];
-            default:
-                break;
-        }
-        try {
-            await runCommand(agent, agent.getMcpServerManager(), sudoMcpServerManager, cmds);
-        }
-        catch (e) {
-            console.log(`ERROR: ${e}`);
-        }
-    }
-}
-async function runCommand(agent, mcpServerManager, sudoMcpServerManager, cmds) {
-    switch (cmds[0]) {
-        case "lt":
-            listTools(mcpServerManager);
-            break;
-        case "ls":
-            listServers(sudoMcpServerManager);
-            break;
-        case "as":
-            await addServer(sudoMcpServerManager, cmds[1]);
-            break;
-        case "rs":
-            await mcpServerManager.removeMcpServer(cmds[1]);
-            break;
-        case "e":
-            mcpServerManager.enableTool(cmds[1], cmds[2]);
-            console.log(`Enabled tool ${cmds[2]} for server ${cmds[1]}`);
-            break;
-        case "d":
-            mcpServerManager.disableTool(cmds[1], cmds[2]);
-            console.log(`Disabled tool ${cmds[2]} for server ${cmds[1]}`);
-            break;
-        case "ea":
-            mcpServerManager.enableAllTools(cmds[1]);
-            console.log(`Enabled all tools for server ${cmds[1]}`);
-            break;
-        case "da":
-            mcpServerManager.disableAllTools(cmds[1]);
-            console.log(`Disabled all tools for server ${cmds[1]}`);
-            break;
-        case "wc":
-            writeConversation(agent, cmds[1]);
-            break;
-        case "wa":
-            writeAgentProfile(agent, cmds[1]);
-            break;
-        case "h":
-        case "help":
-        case "?":
-            helpMenu();
-            break;
-        default:
-            console.log(`error: Unknown command ${cmds[0]}`);
-    }
-}
-function helpMenu() {
-    console.log(`Tool management commands:`);
-    console.log(`  ${chalk_1.default.yellow("/lt")}                          List tools: `);
-    console.log(`  ${chalk_1.default.yellow("/ls")}                          List servers`);
-    console.log(`  ${chalk_1.default.yellow("/as <server-name>")}            Add server`);
-    console.log(`  ${chalk_1.default.yellow("/rs <server-name>")}            Remove server`);
-    console.log(`  ${chalk_1.default.yellow("/e <server-name> <tool-name>")} Enable tool`);
-    console.log(`  ${chalk_1.default.yellow("/d <server-name> <tool-name>")} Disable tool`);
-    console.log(`  ${chalk_1.default.yellow("/ea <server-name>")}            Enable all tools`);
-    console.log(`  ${chalk_1.default.yellow("/da <server-name>")}            Disable all tools`);
-    console.log(`  ${chalk_1.default.yellow("/wc <file-name>")}              Write conversation file`);
-    console.log(`  ${chalk_1.default.yellow("/wa <file-name>")}              Write agent profile file`);
-    console.log(`  ${chalk_1.default.yellow("/q")}                           Quit`);
-}
-function listTools(mcpServerManager) {
-    console.log("Mcp servers and tools (* - enabled):");
-    const serverNames = mcpServerManager.getMcpServerNames();
-    for (const serverName of serverNames) {
-        const server = mcpServerManager.getMcpServer(serverName);
-        console.log(` ${chalk_1.default.green(serverName)}`);
-        const tools = server.getTools();
-        const enabled = server.getEnabledTools();
-        for (const tool of tools) {
-            const isEnabled = enabled[tool.name] ? "*" : " ";
-            console.log(`  [${isEnabled}] ${tool.name}`);
-        }
-    }
-}
-function listServers(sudoMcpServerManager) {
-    console.log(`Available MCP Servers:`);
-    const serverBriefs = sudoMcpServerManager.getServerBriefs();
-    serverBriefs.sort((a, b) => a.name.localeCompare(b.name));
-    for (const brief of serverBriefs) {
-        console.log(`- ${chalk_1.default.green(brief.name)}: ${brief.description}`);
-    }
-}
-/**
- * Adds server and enables all tools.
- */
-async function addServer(sudoMcpServerManager, serverName) {
-    try {
-        await sudoMcpServerManager.addMcpServer(serverName);
-    }
-    catch (e) {
-        if (e instanceof sdk_1.InvalidConfiguration) {
-            throw `${e}. \n
-      Have you installed server ${serverName} using the SudoMCP CLI tool?`;
-        }
-        else {
-            throw e;
-        }
-    }
-    sudoMcpServerManager.getMcpServerManager().enableAllTools(serverName);
-    console.log(`Added server: ${serverName} and enabled all tools.`);
-    console.log(`Current tool list:`);
-    listTools(sudoMcpServerManager.getMcpServerManager());
-}
-function writeConversation(agent, fileName) {
-    const conversation = agent.getConversation();
-    fs.writeFileSync(fileName, JSON.stringify(conversation), {
-        encoding: "utf8",
-    });
-    console.log(`Conversation written to ${fileName}`);
-}
-function writeAgentProfile(agent, fileName) {
-    const profile = agent.getAgentProfile();
-    fs.writeFileSync(fileName, JSON.stringify(profile));
-    console.log(`AgentProfile written to ${fileName}`);
-}
-async function promptToolCall(repl, toolCall) {
-    (0, tools_1.displayToolCall)(toolCall);
-    const response = await repl.run("Approve tool call? (Y/n) ");
-    return response === "y" || response === "yes" || response == "";
-}