@xalia/agent 0.5.4 → 0.5.6

package/dist/agent/src/agent/agent.js

@@ -53,7 +53,7 @@ class Agent {
         this.llm = llm;
         this.toolHandlers = {};
     }
-    static async initializeWithLLM(onMessage, onToolCall, systemPrompt, llm) {
+    static async initializeWithLLM(onMessage, onToolCall, systemPrompt, llm, mcpServerManager) {
         // Initialize messages with system prompt
         const messages = [
             {
@@ -61,15 +61,13 @@ class Agent {
                 content: systemPrompt ?? "You are a helpful assistant",
             },
         ];
-        // Create the server manager
-        const mcpServerManager = new mcpServerManager_1.McpServerManager();
-        return new Agent(onMessage, onToolCall, messages, mcpServerManager, [], llm);
+        return new Agent(onMessage, onToolCall, messages, mcpServerManager ?? new mcpServerManager_1.McpServerManager(), [], llm);
     }
     async shutdown() {
         return this.mcpServerManager.shutdown();
     }
     getAgentProfile() {
-        return new sdk_1.AgentProfile(this.llm.getModel(), this.getSystemMessage(), this.mcpServerManager.getMcpServerSettings());
+        return new sdk_1.AgentProfile(this.llm.getModel(), this.getSystemPrompt(), this.mcpServerManager.getMcpServerSettings());
     }
     getConversation() {
         (0, assert_1.strict)(this.messages[0].role == "system", "first message must have system role");
@@ -86,7 +84,10 @@ class Agent {
     getMcpServerManager() {
         return this.mcpServerManager;
     }
-    async userMessage(msg, imageB64, name) {
+    /**
+     * Like `userMessage`, but can be awaited, and accepts the user name.
+     */
+    async userMessageEx(msg, imageB64, name) {
         const userMessage = createUserMessage(msg, imageB64, name);
         if (!userMessage) {
             return undefined;
@@ -128,7 +129,13 @@ class Agent {
         }
         return completion.choices[0].message;
     }
-    chooseModel(model) {
+    userMessage(msg, imageB64) {
+        this.userMessageEx(msg, imageB64);
+    }
+    getModel() {
+        return this.llm.getModel();
+    }
+    setModel(model) {
         logger.debug(`Set model ${model}`);
         this.llm.setModel(model);
     }
@@ -140,14 +147,14 @@ class Agent {
         // Keep only the system message
         this.messages.splice(1);
     }
-    getSystemMessage() {
+    getSystemPrompt() {
         (0, assert_1.strict)(this.messages[0].role === "system");
         return this.messages[0].content;
     }
     /**
      * Set the system prompt
      */
-    setSystemMessage(systemMsg) {
+    setSystemPrompt(systemMsg) {
         (0, assert_1.strict)(this.messages[0].role === "system");
         this.messages[0].content = systemMsg;
     }

package/dist/agent/src/agent/agentUtils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_LLM_MODEL = exports.DEFAULT_LLM_URL = void 0;
+exports.XALIA_APP_HEADER = exports.DEFAULT_LLM_MODEL = exports.DEFAULT_LLM_URL = void 0;
 exports.createAgentWithSkills = createAgentWithSkills;
+exports.createAgentFromSkillManager = createAgentFromSkillManager;
 exports.createNonInteractiveAgent = createNonInteractiveAgent;
 exports.runOneShot = runOneShot;
 const sdk_1 = require("@xalia/xmcp/sdk");
@@ -11,13 +12,18 @@ const openAILLM_1 = require("./openAILLM");
 const openAILLMStreaming_1 = require("./openAILLMStreaming");
 const dummyLLM_1 = require("./dummyLLM");
 const assert_1 = require("assert");
+const repeatLLM_1 = require("./repeatLLM");
 const logger = (0, sdk_1.getLogger)();
 exports.DEFAULT_LLM_URL = "http://localhost:5001/v1";
 exports.DEFAULT_LLM_MODEL = "gpt-4o";
+exports.XALIA_APP_HEADER = {
+    "HTTP-Referer": "xalia.ai",
+    "X-Title": "Xalia",
+};
 /**
  * Util function to create an Agent from some config information.
  */
-async function createAgent(llmUrl, model, systemPrompt, onMessage, onToolCall, platform, openaiApiKey, stream = false) {
+async function createAgent(llmUrl, model, systemPrompt, onMessage, onToolCall, platform, openaiApiKey, stream = false, mcpServerManager) {
     let llm;
     if (model && model.startsWith("dummy:")) {
         // Dummy Agent
@@ -31,6 +37,9 @@ async function createAgent(llmUrl, model, systemPrompt, onMessage, onToolCall, p
         logger.debug(`Initializing Dummy Agent: ${llmUrl}`);
         llm = new dummyLLM_1.DummyLLM(responses);
     }
+    else if (model === "repeat") {
+        llm = new repeatLLM_1.RepeatLLM();
+    }
     else {
         // Regular Agent
         if (!openaiApiKey) {
@@ -45,7 +54,7 @@ async function createAgent(llmUrl, model, systemPrompt, onMessage, onToolCall, p
         }
     }
     (0, assert_1.strict)(llm);
-    return agent_1.Agent.initializeWithLLM(onMessage, onToolCall, systemPrompt, llm);
+    return agent_1.Agent.initializeWithLLM(onMessage, onToolCall, systemPrompt, llm, mcpServerManager);
 }
 /**
  * Util function to create and initialize an Agent given an AgentProfile.
@@ -66,6 +75,17 @@ async function createAgentWithSkills(llmUrl, agentProfile, onMessage, onToolCall
     logger.debug("[createAgentWithSkills] done");
     return [agent, sudoMcpServerManager];
 }
+async function createAgentFromSkillManager(llmUrl, agentProfile, onMessage, onToolCall, platform, llmApiKey, skillManager, conversation, stream = false) {
+    // Create agent
+    logger.debug("[createAgentAndSudoMcpServerManager] creating agent ...");
+    const mcpServerManager = skillManager.getMcpServerManager();
+    const agent = await createAgent(llmUrl, agentProfile.model, agentProfile.system_prompt, onMessage, onToolCall, platform, llmApiKey, stream, mcpServerManager);
+    if (conversation) {
+        agent.setConversation(conversation);
+    }
+    logger.debug("[createAgentWithSkills] done");
+    return agent;
+}
 /**
  * An "non-interactive" agent is one which is not intended to be used
  * interactively (settings cannot be dyanmically adjusted, intermediate
@@ -94,7 +114,7 @@ async function runOneShot(url, agentProfile, conversation, platform, prompt, ima
     // Create a non-interactive agent and pass any prompt/ image to it.  Return
     // the first answer.
     const agent = await createNonInteractiveAgent(url, agentProfile, conversation, platform, llmApiKey, sudomcpConfig, approveToolsUpTo);
-    const response = await agent.userMessage(prompt, image);
+    const response = await agent.userMessageEx(prompt, image);
     await agent.shutdown();
     logger.debug("[runOneShot]: shutdown done");
     if (!response) {

package/dist/agent/src/agent/mcpServerManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.McpServerManager = exports.McpServerInfo = void 0;
+exports.McpServerManager = exports.McpServerInfoRW = exports.McpServerInfo = void 0;
 exports.computeQualifiedName = computeQualifiedName;
 exports.splitQualifiedName = splitQualifiedName;
 exports.computeOpenAIToolList = computeOpenAIToolList;
@@ -38,12 +38,25 @@ class McpServerInfo {
     }
 }
 exports.McpServerInfo = McpServerInfo;
+/**
+ * Instance of McpServerInfo which supports setting tool state.  Intended for
+ * IMcpServerManager implementations, not for client code.
+ */
+class McpServerInfoRW extends McpServerInfo {
+    enableTool(toolName) {
+        this.enabledToolsMap[toolName] = true;
+    }
+    disableTool(toolName) {
+        delete this.enabledToolsMap[toolName];
+    }
+}
+exports.McpServerInfoRW = McpServerInfoRW;
 /**
  * The internal class holds server info and allows it to be updated. Managed
  * by McpServerManager.  Do not access these methods except via the
  * McpServerManager.
  */
-class McpServerInfoInternal extends McpServerInfo {
+class McpServerInfoInternal extends McpServerInfoRW {
     constructor(client, tools) {
         super(tools);
         const callbacks = {};
@@ -77,12 +90,6 @@ class McpServerInfoInternal extends McpServerInfo {
     async shutdown() {
         await this.client.close();
     }
-    enableTool(toolName) {
-        this.enabledToolsMap[toolName] = true;
-    }
-    disableTool(toolName) {
-        delete this.enabledToolsMap[toolName];
-    }
     getCallback(toolName) {
         return this.callbacks[toolName];
     }
@@ -105,6 +112,9 @@ class McpServerManager {
         }));
         this.mcpServers = {};
     }
+    hasMcpServer(mcpServerName) {
+        return !!this.mcpServers[mcpServerName];
+    }
     getMcpServerNames() {
         return Object.keys(this.mcpServers);
     }
@@ -214,7 +224,7 @@ class McpServerManager {
      */
     getMcpServerSettings() {
         const config = {};
-        // NOTE: on load, entires of the form:
+        // NOTE: on load, entries of the form:
         //
         //   <server>: []
         //

package/dist/agent/src/agent/openAILLM.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAILLM = void 0;
+const agentUtils_1 = require("./agentUtils");
 const openai_1 = require("openai");
 class OpenAILLM {
     constructor(apiKey, apiUrl, model) {
@@ -8,8 +9,9 @@ class OpenAILLM {
             apiKey,
             baseURL: apiUrl,
             dangerouslyAllowBrowser: true,
+            defaultHeaders: agentUtils_1.XALIA_APP_HEADER,
         });
-        this.model = model || "gpt-4o-mini";
+        this.model = model || agentUtils_1.DEFAULT_LLM_MODEL;
     }
     setModel(model) {
         this.model = model;

package/dist/agent/src/agent/openAILLMStreaming.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAILLMStreaming = void 0;
+exports.initializeCompletion = initializeCompletion;
+exports.updateCompletion = updateCompletion;
 const sdk_1 = require("@xalia/xmcp/sdk");
 const openai_1 = require("openai");
 const assert_1 = require("assert");
+const agentUtils_1 = require("./agentUtils");
 const logger = (0, sdk_1.getLogger)();
 function initialToolCallFunction(deltaFn) {
     //   export interface ChatCompletionChunk.Choice.Delta.ToolCall.Function {
@@ -222,7 +225,8 @@ function initializeCompletionChoice(chunkChoice) {
     return {
         choice: {
             message,
-            finish_reason: chunkChoice.finish_reason || "stop",
+            // We use `null` to signal that `finish_reason` is unset
+            finish_reason: chunkChoice.finish_reason || null,
             index: chunkChoice.index,
             logprobs: chunkChoice.logprobs || null,
         },
@@ -251,6 +255,7 @@ function updateCompletionChoice(completionChoice, chunkChoice) {
     (0, assert_1.strict)(completionChoice.index === chunkChoice.index);
     updateCompletionMessage(completionChoice.message, chunkChoice.delta);
     if (chunkChoice.finish_reason) {
+        (0, assert_1.strict)(completionChoice.finish_reason === null, `finish_reason already set: (${completionChoice.finish_reason})`);
         completionChoice.finish_reason = chunkChoice.finish_reason;
         return true;
     }
@@ -261,7 +266,7 @@ function initializeCompletionChoices(chunkChoices) {
     // content to stream.  We keep it simple for now and assume only single
     // choices, which allows us to mark everything as done if any choice we hit is
     // done.
-    (0, assert_1.strict)(chunkChoices.length === 1);
+    (0, assert_1.strict)(chunkChoices.length < 2);
     let msgDone = false;
     const choices = [];
     for (const chunkChoice of chunkChoices) {
@@ -367,8 +372,9 @@ class OpenAILLMStreaming {
             apiKey,
             baseURL: apiUrl,
             dangerouslyAllowBrowser: true,
+            defaultHeaders: agentUtils_1.XALIA_APP_HEADER,
         });
-        this.model = model || "gpt-4o-mini";
+        this.model = model || agentUtils_1.DEFAULT_LLM_MODEL;
     }
     setModel(model) {
         this.model = model;
@@ -391,39 +397,32 @@ class OpenAILLMStreaming {
             throw "not a stream";
         }
         let aggregatedMessage;
-        let done = false;
         for await (const chunk of chunks) {
             logger.debug(`[stream] chunk: ${JSON.stringify(chunk)}`);
-            (0, assert_1.strict)(!done);
             if (chunk.object !== "chat.completion.chunk") {
                 // logger.warn("[stream]: unexpected message");
                 continue;
             }
-            done = (() => {
-                if (!aggregatedMessage) {
-                    logger.debug(`[stream] first}`);
-                    const { initMessage, done } = initializeCompletion(chunk);
-                    aggregatedMessage = initMessage;
-                    return done;
-                }
-                else {
-                    return updateCompletion(aggregatedMessage, chunk);
-                }
-            })();
+            if (!aggregatedMessage) {
+                logger.debug(`[stream] first}`);
+                const { initMessage } = initializeCompletion(chunk);
+                aggregatedMessage = initMessage;
+            }
+            else {
+                updateCompletion(aggregatedMessage, chunk);
+            }
             if (onMessage) {
-                // Inform the call of a message fragment.  Note that even if there is
-                // no content, we must call `onMessage` once `done` is true.
-                const delta = chunk.choices[0].delta;
-                if (delta.content) {
-                    await onMessage(delta.content, done);
-                }
-                else if (done) {
-                    await onMessage("", true);
+                // Inform the call of a message fragment if it contains any text.
+                const delta = chunk.choices[0]?.delta;
+                if (delta?.content) {
+                    await onMessage(delta.content, false);
                 }
             }
         }
+        if (onMessage) {
+            await onMessage("", true);
+        }
         logger.debug(`[stream] final message: ${JSON.stringify(aggregatedMessage)}`);
-        (0, assert_1.strict)(done);
         (0, assert_1.strict)(aggregatedMessage);
         return aggregatedMessage;
     }

package/dist/agent/src/agent/repeatLLM.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RepeatLLM = void 0;
+const assert_1 = require("assert");
+class RepeatLLM {
+    constructor() {
+        this.idx = 0;
+    }
+    getModel() {
+        return "repeat";
+    }
+    getUrl() {
+        throw "cannot get url for RepeatLLM";
+    }
+    async getConversationResponse(_messages, _tools, onMessage) {
+        await new Promise((r) => setTimeout(r, 0));
+        const content = `Message number ${this.idx++}`;
+        const response = {
+            finish_reason: "stop",
+            index: 0,
+            logprobs: null,
+            message: {
+                content,
+                refusal: null,
+                role: "assistant",
+            },
+        };
+        if (onMessage) {
+            onMessage(content, true);
+        }
+        return {
+            id: "" + this.idx,
+            choices: [response],
+            created: Date.now(),
+            model: "dummyLlmModel",
+            object: "chat.completion",
+        };
+    }
+    setModel(_model) {
+        (0, assert_1.strict)(false, "unexpected call to setModel");
+    }
+}
+exports.RepeatLLM = RepeatLLM;

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

@@ -62,7 +62,7 @@ class SkillManager {
         // Concurrently establish all server connections
         const addServer = async (serverName) => {
             logger.debug(`restoring ${serverName} ...`);
-            return this.addMcpServer(serverName);
+            return this.addMcpServer(serverName, false);
         };
         await Promise.all(Object.entries(mcpConfig).map((e) => addServer(e[0])));
         // Enable tools
@@ -93,6 +93,9 @@ class SkillManager {
         this.serverBriefsMap = mcpServersMap;
         this.toolCache = {};
     }
+    hasServer(serverName) {
+        return !!this.serverBriefsMap[serverName];
+    }
     getServerBriefs() {
         return this.serverBriefs;
     }
@@ -116,11 +119,10 @@ class SkillManager {
         return tools;
     }
     /**
-     * Add a server to the `McpServerManager`, using `ApiClient`
-     * to produce the transport. Validates the server's config
-     * schema, if applicable.
+     * Add a server to the `McpServerManager`, using `ApiClient` to produce the
+     * transport. Validates the server's config schema, if applicable.
      */
-    async addMcpServer(serverName) {
+    async addMcpServer(serverName, enableAll) {
         const tools = await this.getServerTools(serverName);
         const originalName = this.serverBriefsMap[serverName].originalName;
         const mcpserver = await this.apiClient.getDetails(originalName, "run");
@@ -129,7 +131,11 @@ class SkillManager {
             version: "1.0.0",
         });
         await connectServer(client, this.apiClient, mcpserver, this.openUrl, this.authorized_url);
-        await this.mcpServerManager.addMcpServerWithClient(client, serverName, tools);
+        const msm = this.mcpServerManager;
+        await msm.addMcpServerWithClient(client, serverName, tools);
+        if (enableAll) {
+            msm.enableAllTools(serverName);
+        }
     }
     getOriginalName(serverName) {
         return this.serverBriefsMap[serverName].name;