@xalia/agent 0.5.0 → 0.5.2

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

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Database = exports.SUPABASE_LOCAL_KEY = exports.SUPABASE_LOCAL_URL = void 0;
+exports.resolveCompoundName = resolveCompoundName;
+const supabase_js_1 = require("@supabase/supabase-js");
+const sdk_1 = require("@xalia/xmcp/sdk");
+const logger = (0, sdk_1.getLogger)();
+exports.SUPABASE_LOCAL_URL = "http://127.0.0.1:54321";
+exports.SUPABASE_LOCAL_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiw" +
+    "icm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJz" +
+    "dJsyH-qQwv8Hdp7fsn3W0YpN81IU";
+/**
+ * 'name' -> 'name'
+ * 'space/name' -> ['space', 'name']
+ */
+function resolveCompoundName(name) {
+    const components = name.split("/");
+    if (components.length === 1) {
+        return name;
+    }
+    if (components.length !== 2) {
+        throw "invalid compound name";
+    }
+    return components;
+}
+class Database {
+    constructor(supabaseUrl, supabaseKey) {
+        this.client = (0, supabase_js_1.createClient)(supabaseUrl, supabaseKey);
+    }
+    async getUserDataFromApiKey(apiKey) {
+        const { data, error } = await this.client
+            .from("api_keys")
+            .select("user_uuid, users ( nickname )")
+            .eq("api_key", apiKey)
+            .maybeSingle();
+        logger.debug(`[getUserDataFromApiKey]: got ${JSON.stringify({ data, error })}`);
+        if (error) {
+            throw error;
+        }
+        if (data === null) {
+            return undefined;
+        }
+        return {
+            user_uuid: data.user_uuid,
+            nickname: data.users.nickname || `user ${data.user_uuid}`,
+        };
+    }
+    async createUser(user_uuid, email, nickname, timezone) {
+        const payload = {
+            uuid: user_uuid,
+            email,
+            nickname,
+            timezone: timezone || "UTC",
+        };
+        const { error } = await this.client.from("users").insert(payload);
+        if (error) {
+            throw error;
+        }
+    }
+    async addApiKey(user_uuid, api_key, name, scopes, is_default = false) {
+        const payload = {
+            user_uuid,
+            api_key,
+            name,
+            scopes,
+            is_default,
+        };
+        const { data, error } = await this.client
+            .from("api_keys")
+            .insert(payload)
+            .select("*")
+            .maybeSingle();
+        if (error) {
+            throw error;
+        }
+        return data;
+    }
+    async getSavedAgentProfileById(agentProfileId) {
+        const { data, error } = await this.client
+            .from("agent_profiles")
+            .select("*")
+            .eq("uuid", agentProfileId)
+            .maybeSingle();
+        if (error) {
+            throw error;
+        }
+        return data
+            ? sdk_1.SavedAgentProfile.fromJSONObj(data)
+            : undefined;
+    }
+    async getSavedAgentProfileByName(user_uuid, agentProfileName) {
+        const { data, error } = await this.client
+            .from("agent_profiles")
+            .select("*")
+            .eq("user_uuid", user_uuid)
+            .eq("profile_name", agentProfileName)
+            .maybeSingle();
+        if (error) {
+            throw error;
+        }
+        return data
+            ? sdk_1.SavedAgentProfile.fromJSONObj(data)
+            : undefined;
+    }
+    async getAgentProfileById(agentProfileId) {
+        const { data, error } = await this.client
+            .from("agent_profiles")
+            .select("profile")
+            .eq("uuid", agentProfileId)
+            .maybeSingle();
+        if (error) {
+            throw error;
+        }
+        return data
+            ? sdk_1.AgentProfile.fromJSONObj(data.profile)
+            : undefined;
+    }
+    async createAgentProfile(user_uuid, profileName, profile) {
+        const payload = {
+            profile: profile,
+            user_uuid,
+            profile_name: profileName,
+        };
+        const { data, error } = await this.client
+            .from("agent_profiles")
+            .upsert(payload)
+            .select("uuid");
+        if (error) {
+            throw error;
+        }
+        if (!data || !data[0] || !data[0].uuid) {
+            return undefined;
+        }
+        return data[0].uuid;
+    }
+    async clearAgentProfiles() {
+        await this.client.from("agent_profiles").delete().neq("uuid", "");
+    }
+    // TODO: is there a session model?
+    async getSessionById(session_uuid) {
+        const { data, error } = await this.client
+            .from("sessions")
+            .select("*")
+            .eq("uuid", session_uuid)
+            .maybeSingle();
+        if (error) {
+            throw error;
+        }
+        return data;
+    }
+    async getSessionByName(user_uuid, session_name) {
+        const { data, error } = await this.client
+            .from("sessions")
+            .select("*")
+            .eq("user_uuid", user_uuid)
+            .eq("title", session_name)
+            .maybeSingle();
+        if (error) {
+            throw error;
+        }
+        return data;
+    }
+    async createSession(user_uuid, title, agentProfileId) {
+        const payload = {
+            agent_profile_uuid: agentProfileId,
+            user_uuid,
+            title: title,
+            conversation: [],
+        };
+        const { data, error } = await this.client
+            .from("sessions")
+            .upsert(payload)
+            .select("uuid");
+        if (error) {
+            throw error;
+        }
+        if (!data || !data[0] || !data[0].uuid) {
+            return undefined;
+        }
+        return data[0].uuid;
+    }
+    async clearSessions() {
+        await this.client.from("sessions").delete().neq("uuid", "");
+    }
+}
+exports.Database = Database;

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,158 @@
+#!/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 });
+exports.runServer = runServer;
+const dotenv = __importStar(require("dotenv"));
+const sdk_1 = require("@xalia/xmcp/sdk");
+const ws = __importStar(require("ws"));
+const url_1 = require("url");
+const conversationManager_1 = require("./conversationManager");
+const db_1 = require("./db");
+const apiKeyManager_1 = require("./apiKeyManager");
+dotenv.config();
+const logger = (0, sdk_1.getLogger)();
+/**
+ * Try as id, then by user/name and return the AgentProfile uuid.
+ */
+async function resolveAgentProfileId(db, userData, agentProfileIdentifier) {
+    let ap = await db.getSavedAgentProfileById(agentProfileIdentifier);
+    logger.debug(`[resolveAgentProfileId]: by id: {JSON.stringify(ap)}`);
+    if (ap) {
+        return agentProfileIdentifier;
+    }
+    ap = await db.getSavedAgentProfileByName(userData.user_uuid, agentProfileIdentifier);
+    logger.debug(`[resolveAgentProfileId]: by name: {JSON.stringify(ap)}`);
+    if (ap) {
+        return ap.uuid;
+    }
+    logger.debug("[resolveAgentProfileId]: agent profile not found");
+    return undefined;
+}
+async function resolveSessionIdFromIdentifier(db, userData, sessionIdentifier) {
+    let session = undefined;
+    const compound = (0, db_1.resolveCompoundName)(sessionIdentifier);
+    if (typeof compound === "string") {
+        // 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);
+        }
+    }
+    else {
+        session = await db.getSessionByName(compound[0], compound[1]);
+    }
+    return session?.uuid;
+}
+/**
+ * Expect parameters to be either:
+ *   session_id                  - uuid, name, user/name
+ *   agent_profile_id (optional) - uuid, name
+ *
+ * If session_idd resolves to an existing session, it is used (and
+ * agent_profile_id is ignored).  Otherwise, session_id is used as the name of
+ * a new session to create using `agent_profile_id`.  The session UUID is
+ * returned in either case.
+ */
+async function findOrCreateSession(db, userData, query) {
+    logger.debug(`[findOrCreateSession]: query: ${JSON.stringify(query)}`);
+    if (!query.session_id || typeof query.session_id !== "string") {
+        throw "session_id invalid or not present";
+    }
+    const sessionId = await resolveSessionIdFromIdentifier(db, userData, query.session_id);
+    if (sessionId) {
+        return sessionId;
+    }
+    const agentProfileIdParam = query.agent_profile_id;
+    logger.debug(`[findOrCreateSession]: agent: ${agentProfileIdParam}`);
+    if (!agentProfileIdParam) {
+        throw "no existing session, and no agent_profile_id given";
+    }
+    if (typeof agentProfileIdParam !== "string") {
+        throw "no existing session and invalid agent_profile_id";
+    }
+    logger.debug(`[findOrCreateSession]: creating session: ${query.session_id}`);
+    const agentProfileId = await resolveAgentProfileId(db, userData, agentProfileIdParam);
+    logger.debug(`[findOrCreateSession]: resolved agentProfileId: ${agentProfileId}`);
+    if (!agentProfileId) {
+        throw `no agent profile: ${agentProfileIdParam}`;
+    }
+    return db.createSession(userData.user_uuid, query.session_id, agentProfileId);
+}
+async function runServer(port, supabaseUrl, supabaseKey, llmUrl, xmcpUrl) {
+    return new Promise((r, _e) => {
+        const wss = new ws.Server({ port });
+        const db = new db_1.Database(supabaseUrl, supabaseKey);
+        const apiKeyManager = new apiKeyManager_1.ApiKeyManager(db);
+        const cm = new conversationManager_1.ConversationManager(db, llmUrl, xmcpUrl);
+        wss.on("connection", async (ws, req) => {
+            try {
+                logger.info(`[server] connection: ${req}`);
+                // Check header
+                logger.info(`[server] headers: ${JSON.stringify(req.headers)}`);
+                const apiKey = req.headers["sec-websocket-protocol"];
+                if (!apiKey) {
+                    throw "empty api key";
+                }
+                const userData = await apiKeyManager.verifyApiKey(apiKey);
+                if (!userData) {
+                    throw "invalid api key";
+                }
+                // Get sessionId
+                const { query } = (0, url_1.parse)(req.url || "", true);
+                const sessionId = await findOrCreateSession(db, userData, query);
+                logger.debug(`resolved session id: ${sessionId}`);
+                if (!sessionId) {
+                    throw "failed to find/create session";
+                }
+                // Associate the ws, username with the conversation
+                await cm.join(sessionId, apiKey, apiKey, userData, ws);
+            }
+            catch (e) {
+                if (typeof e === "string") {
+                    logger.warn(`[server]: error: ${e}`);
+                    ws.close(4000, e);
+                }
+                else {
+                    logger.error(`other error: ${JSON.stringify(e)}`);
+                    throw e;
+                }
+            }
+        });
+        logger.info(`[server] started: ws://localhost:${port}/`);
+        r(wss);
+    });
+}

package/dist/agent/src/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const db_1 = require("../chat/db");
+const assert_1 = require("assert");
+const sdk_1 = require("@xalia/xmcp/sdk");
+const sudoMcpServerManager_1 = require("../agent/sudoMcpServerManager");
+function getLocalDB() {
+    return new db_1.Database(db_1.SUPABASE_LOCAL_URL, db_1.SUPABASE_LOCAL_KEY);
+}
+const AGENT_PROFILE = {
+    model: undefined,
+    system_prompt: "You are an unhelpful agent",
+    mcp_settings: {},
+};
+async function createDummyUser(db) {
+    const apiClient = new sdk_1.ApiClient(sudoMcpServerManager_1.LOCAL_SERVER_URL, "dummy_key");
+    const user = await apiClient.getUserBrief("dummy_user");
+    if (!user) {
+        await db.createUser("dummy_user", "a@b.com", "Dummy User");
+        await db.addApiKey("dummy_user", "dummy_key", "default", [], true);
+        if (!apiClient.getUserBrief("dummy_user")) {
+            throw "unable to create dummy user";
+        }
+    }
+}
+describe("DB", () => {
+    it("should get 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",
+            nickname: "Dummy User",
+        });
+    });
+    it("should return undefined for non-existant user", async function () {
+        const db = getLocalDB();
+        const dummyUser = await db.getUserDataFromApiKey("no_such_key");
+        (0, chai_1.expect)(dummyUser).to.equal(undefined);
+    });
+    it("should create and retrieve 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);
+        const savedAgentProfile = (await db.getSavedAgentProfileById(agentProfileId));
+        const savedAgentProfileByName = (await db.getSavedAgentProfileByName("dummy_user", "test_profile"));
+        const agentProfile = (await db.getAgentProfileById(agentProfileId));
+        (0, chai_1.expect)(savedAgentProfile.uuid).eql(agentProfileId);
+        (0, chai_1.expect)(savedAgentProfile.profile).eql(AGENT_PROFILE);
+        (0, chai_1.expect)(savedAgentProfile?.user_uuid).eql("dummy_user");
+        (0, chai_1.expect)(savedAgentProfile?.profile_name).eql("test_profile");
+        (0, chai_1.expect)(savedAgentProfileByName).eql(savedAgentProfile);
+        (0, chai_1.expect)(agentProfile).eql(AGENT_PROFILE);
+    });
+    it("should create and retrieve sessions", async function () {
+        const db = getLocalDB();
+        await db.clearAgentProfiles();
+        await db.clearSessions();
+        const agentProfileId = await db.createAgentProfile("dummy_user", "test_profile", AGENT_PROFILE);
+        (0, assert_1.strict)(agentProfileId);
+        const sessionId = await db.createSession("dummy_user", "test_session", agentProfileId);
+        (0, assert_1.strict)(sessionId);
+        const session = (await db.getSessionById(sessionId));
+        (0, chai_1.expect)(session.agent_profile_uuid).eql(agentProfileId);
+        (0, chai_1.expect)(session.conversation).eql([]);
+        (0, chai_1.expect)(session.title).eql("test_session");
+        (0, chai_1.expect)(session.user_uuid).eql("dummy_user");
+        (0, chai_1.expect)(session.uuid).eql(sessionId);
+    });
+});

package/dist/{test → agent/src/test}/imageLoad.test.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
-const files_1 = require("../files");
+const files_1 = require("../tool/files");
 const assert_1 = require("assert");
 describe("Image loading", () => {
     it("convert to data url", async function () {

package/dist/{test → agent/src/test}/mcpServerManager.test.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
-const mcpServerManager_1 = require("../mcpServerManager");
+const mcpServerManager_1 = require("../agent/mcpServerManager");
 // Handle automatically closing at the end of tests.
 let managers = {};
 let idx = 0;

package/dist/{test → 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("../prompt");
+const prompt_1 = require("../tool/prompt");
 describe("Prompt", () => {
     it("should recognise commands", async function () {
         const expectedResults = {

package/dist/{test → agent/src/test}/sudoMcpServerManager.test.js

@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prettyPrintTool = prettyPrintTool;
 const chai_1 = require("chai");
-const mcpServerManager_1 = require("../mcpServerManager");
-const sudoMcpServerManager_1 = require("../sudoMcpServerManager");
 const chalk_1 = __importDefault(require("chalk"));
+const mcpServerManager_1 = require("../agent/mcpServerManager");
+const sudoMcpServerManager_1 = require("../agent/sudoMcpServerManager");
 let managers = undefined;
 async function getServerManagers() {
     if (!managers) {
         const tm = new mcpServerManager_1.McpServerManager();
-        const sm = await sudoMcpServerManager_1.SudoMcpServerManager.initialize(tm, (_url) => {
+        const sm = await sudoMcpServerManager_1.SkillManager.initialize(tm, (_url) => {
             throw "unexpected call to openUrl";
         }, sudoMcpServerManager_1.LOCAL_SERVER_URL, "dummy_key");
         managers = [tm, sm];

package/dist/{chat.js → agent/src/tool/agentChat.js}

@@ -39,13 +39,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runChat = runChat;
 const yocto_spinner_1 = __importDefault(require("yocto-spinner"));
 const fs = __importStar(require("fs"));
-const tools_1 = require("./tools");
-const files_1 = require("./files");
-const prompt_1 = require("./prompt");
 const chalk_1 = __importDefault(require("chalk"));
 const tool_1 = require("@xalia/xmcp/tool");
 const sdk_1 = require("@xalia/xmcp/sdk");
-const agentUtils_1 = require("./agentUtils");
+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 logger = (0, sdk_1.getLogger)();
 async function write(msg) {
@@ -93,7 +93,7 @@ async function runChat(llmUrl, agentProfile, conversation, prompt, image, llmApi
         return result;
     };
     // Create agent
-    const [agent, sudoMcpServerManager] = await (0, agentUtils_1.createAgentAndSudoMcpServerManager)(llmUrl, agentProfile, onMessage, onToolCall, nodePlatform_1.NODE_PLATFORM, llmApiKey, sudomcpConfig, tool_1.utils.FRONTEND_PROD_AUTHORIZED_URL, undefined, stream);
+    const [agent, sudoMcpServerManager] = await (0, agentUtils_1.createAgentWithSkills)(llmUrl, agentProfile, onMessage, onToolCall, nodePlatform_1.NODE_PLATFORM, llmApiKey, sudomcpConfig, tool_1.utils.FRONTEND_PROD_AUTHORIZED_URL, undefined, stream);
     if (conversation) {
         agent.setConversation(conversation);
     }

package/dist/{main.js → agent/src/tool/agentMain.js}

@@ -1,6 +1,4 @@
-#!/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);
@@ -35,21 +33,22 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.agentMain = void 0;
 const fs = __importStar(require("fs"));
 const dotenv = __importStar(require("dotenv"));
 const cmd_ts_1 = require("cmd-ts");
-const agent_1 = require("./agent");
-const options_1 = require("./options");
-const files_1 = require("./files");
+const assert_1 = require("assert");
 const tool_1 = require("@xalia/xmcp/tool");
 const sdk_1 = require("@xalia/xmcp/sdk");
-const agentUtils_1 = require("./agentUtils");
-const chat_1 = require("./chat");
+const agent_1 = require("../agent/agent");
+const agentUtils_1 = require("../agent/agentUtils");
+const options_1 = require("./options");
+const files_1 = require("./files");
+const agentChat_1 = require("./agentChat");
 const nodePlatform_1 = require("./nodePlatform");
-const assert_1 = require("assert");
 dotenv.config();
 const logger = (0, sdk_1.getLogger)();
-const main = (0, cmd_ts_1.command)({
+exports.agentMain = (0, cmd_ts_1.command)({
     name: "main",
     args: {
         promptFile: options_1.promptFile,
@@ -136,12 +135,7 @@ const main = (0, cmd_ts_1.command)({
         }
         else {
             const prompt = (0, files_1.loadFileOrUndefined)(promptFile);
-            return (0, chat_1.runChat)(llmUrl, agentProfile, startingConversation, prompt, imageFile, llmApiKey, sudomcpConfig, approveToolsUpTo, !noStreaming);
+            return (0, agentChat_1.runChat)(llmUrl, agentProfile, startingConversation, prompt, imageFile, llmApiKey, sudomcpConfig, approveToolsUpTo, !noStreaming);
         }
     },
 });
-function handleError(msg) {
-    console.error(msg);
-    process.exit(1);
-}
-(0, cmd_ts_1.run)(main, process.argv.slice(2)).catch(handleError);