@xalia/agent 0.6.8 → 0.6.9

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

@@ -56,7 +56,7 @@ const MESSAGES = [
         content: { role: "assistant", content: "msg502" },
     },
 ];
-function testSuccessfulAgentLoop(cm, startIdx) {
+async function testSuccessfulAgentLoop(cm, startIdx) {
     // 2 user messages arrive as ClientUserMessage. Assign message indices and
     // convert them to ServerUserMessages.
     const serverUserMessage0 = cm.processUserMessage({ type: "msg", message: "UserMessage0" }, "user0", "User0");
@@ -83,9 +83,9 @@ function testSuccessfulAgentLoop(cm, startIdx) {
     // MESSAGE_INDEX_FULL_INCREMENT
     (0, assert_1.strict)(serverUserMessage0 && serverUserMessage1);
     const userMsgs = [serverUserMessage0, serverUserMessage1];
-    const { llmUserMessages, agentFirstChunk } = cm.startAgentResponse(userMsgs);
+    const { contextTx, agentFirstChunk } = await cm.startAgentResponse(userMsgs);
     (0, vitest_1.expect)(agentFirstChunk.message_idx).eql(startIdx + 2 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT);
-    (0, vitest_1.expect)(llmUserMessages).eql(userMsgs.map((su) => {
+    (0, vitest_1.expect)(contextTx.getLLMContext().slice(1)).eql(userMsgs.map((su) => {
         return {
             role: "user",
             name: su.user_uuid,
@@ -93,7 +93,7 @@ function testSuccessfulAgentLoop(cm, startIdx) {
         };
     }));
     // The agent sends message chunks.  Check the message_idx
-    const chunkMsg0 = cm.processAgentMessage("AgentMe", false);
+    const chunkMsg0 = contextTx.processAgentMessageChunk("AgentMe", false);
     (0, vitest_1.expect)(chunkMsg0).eql({
         type: "agent_msg_chunk",
         session_id: "some_session_id",
@@ -101,7 +101,7 @@ function testSuccessfulAgentLoop(cm, startIdx) {
         message: "AgentMe",
         end: false,
     });
-    const chunkMsg1 = cm.processAgentMessage("ssage2", true);
+    const chunkMsg1 = contextTx.processAgentMessageChunk("ssage2", true);
     (0, vitest_1.expect)(chunkMsg1).eql({
         type: "agent_msg_chunk",
         session_id: "some_session_id",
@@ -132,7 +132,8 @@ function testSuccessfulAgentLoop(cm, startIdx) {
         ],
         content: "AgentMessage2",
     };
-    cm.processAgentResponse(agentResponseWithToolCall);
+    contextTx.addMessage(agentResponseWithToolCall);
+    contextTx.processAgentResponse(agentResponseWithToolCall);
     // Meanwhile, a new user message comes in.  It is assigned idx
     // startIdx + 3*MESSAGE_INDEX_FULL_INCREMENT.
     const serverUserMessage3 = cm.processUserMessage({ type: "msg", message: "UserMessage3" }, "user3", "User3");
@@ -159,11 +160,13 @@ function testSuccessfulAgentLoop(cm, startIdx) {
             content: "tool_response_1",
         },
     ];
-    const toolCallMesasge0 = cm.processToolCallResult(toolCallResults[0]);
+    contextTx.addMessage(toolCallResults[0]);
+    contextTx.addMessage(toolCallResults[1]);
+    const toolCallMesasge0 = contextTx.processToolCallResult(toolCallResults[0]);
     (0, vitest_1.expect)(toolCallMesasge0.message_idx).eql(startIdx +
         2 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT +
         1 * conversation_1.MESSAGE_INDEX_SUB_INCREMENT);
-    const toolCallMesasge1 = cm.processToolCallResult(toolCallResults[1]);
+    const toolCallMesasge1 = contextTx.processToolCallResult(toolCallResults[1]);
     (0, vitest_1.expect)(toolCallMesasge1.message_idx).eql(startIdx +
         2 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT +
         2 * conversation_1.MESSAGE_INDEX_SUB_INCREMENT);
@@ -172,15 +175,11 @@ function testSuccessfulAgentLoop(cm, startIdx) {
         role: "assistant",
         content: "AgentMessage2",
     };
-    // The agent adds the messages to the context at the end of processing
-    cm.addMessages(llmUserMessages);
-    cm.addMessage(agentResponseWithToolCall);
-    cm.addMessage(toolCallResults[0]);
-    cm.addMessage(toolCallResults[1]);
-    cm.addMessage(finalAgentResponse);
-    // Agent then returns the final response to the caller (OpenSession)
-    cm.processAgentResponse(finalAgentResponse);
-    const dbMessages = cm.endAgentResponse();
+    contextTx.addMessage(finalAgentResponse);
+    // Agent then returns the final response to the caller (OpenSession), which
+    // sets it on the Tx.
+    contextTx.processAgentResponse(finalAgentResponse);
+    const dbMessages = await cm.endAgentResponse(contextTx);
     // Expect
     const expectDbMessages = [
         {
@@ -287,7 +286,7 @@ describe("IndexingCompressingContextManager", () => {
             lastEntryIdx: 600, // Should be max(502, 600) = 600
         });
     });
-    it("conversation processing behaviour", () => {
+    it("conversation processing behaviour", async () => {
         const writer = {
             writeCheckpoint: (_sc) => {
                 return new Promise((r) => {
@@ -295,10 +294,10 @@ describe("IndexingCompressingContextManager", () => {
                 });
             },
         };
-        const cm = new chatContextManager_1.ChatContextManager("sys_prompt", [], "some_session_id", "no_such_user", undefined, "", "", "", writer, new sessionFileManager_1.MemoryFileManager());
-        testSuccessfulAgentLoop(cm, 0);
+        const cm = new chatContextManager_1.ChatContextManager("sys_prompt", [], "some_session_id", "no_such_user", undefined, writer, new sessionFileManager_1.MemoryFileManager(), undefined);
+        await testSuccessfulAgentLoop(cm, 0);
     });
-    it("error handling", () => {
+    it("error handling", async () => {
         const writer = {
             writeCheckpoint: (_sc) => {
                 return new Promise((r) => {
@@ -306,7 +305,7 @@ describe("IndexingCompressingContextManager", () => {
                 });
             },
         };
-        const cm = new chatContextManager_1.ChatContextManager("sys_prompt", [], "some_session_id", "no_such_user", undefined, "", "", "", writer, new sessionFileManager_1.MemoryFileManager());
+        const cm = new chatContextManager_1.ChatContextManager("sys_prompt", [], "some_session_id", "no_such_user", undefined, writer, new sessionFileManager_1.MemoryFileManager(), undefined);
         //  1 user messages
         const serverUserMessage0 = cm.processUserMessage({ type: "msg", message: "UserMessage0" }, "user0", "User0");
         (0, vitest_1.expect)(serverUserMessage0).eql({
@@ -322,11 +321,11 @@ describe("IndexingCompressingContextManager", () => {
         // Agent response has a tool call.  It is assigned 1 *
         // MESSAGE_INDEX_FULL_INCREMENT
         (0, assert_1.strict)(serverUserMessage0);
-        const { llmUserMessages, agentFirstChunk } = cm.startAgentResponse([
+        const { contextTx, agentFirstChunk } = await cm.startAgentResponse([
             serverUserMessage0,
         ]);
         (0, vitest_1.expect)(agentFirstChunk.message_idx).eql(1 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT);
-        (0, vitest_1.expect)(llmUserMessages).eql([
+        (0, vitest_1.expect)(contextTx.getLLMContext().slice(1)).eql([
             {
                 role: "user",
                 name: serverUserMessage0.user_uuid,
@@ -356,7 +355,8 @@ describe("IndexingCompressingContextManager", () => {
             ],
             content: "AgentMessage2",
         };
-        cm.processAgentResponse(agentResponseWithToolCall);
+        contextTx.addMessage(agentResponseWithToolCall);
+        contextTx.processAgentResponse(agentResponseWithToolCall);
         // The current Agent does not add the tool call results until the next
         // completion has run.  Here we are simulating an error during that
         // process, but the Agent still sends the tool call results to the event
@@ -376,16 +376,18 @@ describe("IndexingCompressingContextManager", () => {
                 content: "tool_response_1",
             },
         ];
-        const toolCallMesasge0 = cm.processToolCallResult(toolCallResults[0]);
+        contextTx.addMessage(toolCallResults[0]);
+        contextTx.addMessage(toolCallResults[1]);
+        const toolCallMesasge0 = contextTx.processToolCallResult(toolCallResults[0]);
         (0, vitest_1.expect)(toolCallMesasge0.message_idx).eql(1 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT + 1 * conversation_1.MESSAGE_INDEX_SUB_INCREMENT);
-        const toolCallMesasge1 = cm.processToolCallResult(toolCallResults[1]);
+        const toolCallMesasge1 = contextTx.processToolCallResult(toolCallResults[1]);
         (0, vitest_1.expect)(toolCallMesasge1.message_idx).eql(1 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT + 2 * conversation_1.MESSAGE_INDEX_SUB_INCREMENT);
         // The error is caught by OpenSession, which informs the
         // ChatContextManager.
-        cm.revertAgentResponse("an error occured");
+        contextTx.revertAgentResponse("an error occured");
         // We should now be able to run the original test (starting from index
         // 2*MESSAGE_INDEX_FULL_INCREMENT).  None of our previous messages should
         // hit the DB or the LLM context.
-        testSuccessfulAgentLoop(cm, 2 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT);
+        await testSuccessfulAgentLoop(cm, 2 * conversation_1.MESSAGE_INDEX_FULL_INCREMENT);
     });
 });

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

@@ -25,7 +25,6 @@ const logger = (0, sdk_1.getLogger)();
     const mockEnv = {
         SUPABASE_URL: database_2.SUPABASE_LOCAL_URL,
         SUPABASE_KEY: database_2.SUPABASE_LOCAL_KEY,
-        LLM_URL: "http://localhost:8080", // not used in this test
         XMCP_URL: "http://localhost:8081", // not used in this test
     };
     (0, vitest_1.beforeAll)(async () => {
@@ -43,7 +42,7 @@ const logger = (0, sdk_1.getLogger)();
             logger.warn("[Test] Test data setup failed - will test with existing data:", error);
         }
         // Start the real server using runServer
-        server = await (0, server_1.runServer)(serverPort, mockEnv.SUPABASE_URL, mockEnv.SUPABASE_KEY, mockEnv.LLM_URL, mockEnv.XMCP_URL);
+        server = await (0, server_1.runServer)(serverPort, mockEnv.SUPABASE_URL, mockEnv.SUPABASE_KEY, mockEnv.XMCP_URL);
         // Wait for server to be ready
         await new Promise((resolve) => setTimeout(resolve, 500));
     });

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

@@ -2,41 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
 const compressingContextManager_1 = require("../agent/compressingContextManager");
-const MESSAGES = [
-    { role: "user", content: "msg200" },
-    { role: "assistant", content: "msg300" },
-    { role: "user", content: "msg400" },
-    {
-        role: "assistant",
-        content: "msg500",
-        tool_calls: [
-            {
-                id: "tool_call_0",
-                type: "function",
-                function: { name: "tool1", arguments: "" },
-            },
-        ],
-    },
-    {
-        role: "tool",
-        content: "msg501",
-        tool_call_id: "tool_call_0",
-    },
-    { role: "assistant", content: "msg502" },
-];
+const contextTestTools_1 = require("./contextTestTools");
+const agentUtils_1 = require("../agent/agentUtils");
 describe("Compression context", () => {
-    it("context compression", async function () {
-        const ccm = new compressingContextManager_1.CompressingContextManager("sys_prompt", [], "", // llmUrl
-        "repeat", // llmModel
-        "" // llmApiKey
+    it("context compression (basic)", async function () {
+        const ccm = new compressingContextManager_1.CompressingContextManager("sys_prompt", [], () => undefined // getLLM
         );
+        await (0, contextTestTools_1.basicContextTest)(ccm);
+    });
+    it("context compression", async function () {
+        const llm = await (0, agentUtils_1.createLLM)("", "", "repeat", false, undefined);
+        const ccm = new compressingContextManager_1.CompressingContextManager("sys_prompt", [], () => Promise.resolve(llm));
         // Add first 2 messages
-        ccm.addMessages(MESSAGES.slice(0, 2));
-        ccm.commit();
+        let tx = await ccm.startTx([contextTestTools_1.MESSAGES[0]]);
+        tx.addMessage(contextTestTools_1.MESSAGES[1]);
+        await ccm.commit(tx);
         // Start the compression
         const compressionP = ccm.compress();
         // Add more messages and update system prompt
-        ccm.addMessages(MESSAGES.slice(2));
+        tx = await ccm.startTx([contextTestTools_1.MESSAGES[2]]);
+        tx.addMessages(contextTestTools_1.MESSAGES.slice(3));
+        await ccm.commit(tx);
         ccm.setAgentPrompt("New system prompt");
         // Wait for compression to complete, then get the new context
         const summary = await compressionP;
@@ -51,15 +37,15 @@ describe("Compression context", () => {
                 content: "New system prompt",
             },
             (0, compressingContextManager_1.createCheckpointMessage)(expectSummary),
-            MESSAGES[2], // 400
-            MESSAGES[3], // 500
-            MESSAGES[4], // 501
-            MESSAGES[5], // 502
+            contextTestTools_1.MESSAGES[2], // 400
+            contextTestTools_1.MESSAGES[3], // 500
+            contextTestTools_1.MESSAGES[4], // 501
+            contextTestTools_1.MESSAGES[5], // 502
         ];
         (0, vitest_1.expect)(summary).eql(expectSummary);
         (0, vitest_1.expect)(context).eql(expectContext);
-        // Pending messages shoudl still be intact
-        const pending = ccm.getPending();
-        (0, vitest_1.expect)(pending).eql(MESSAGES.slice(2));
+        // // Pending messages should still be intact
+        // const pending = ccm.getPending();
+        // expect(pending).eql(MESSAGES.slice(2));
     });
 });

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

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
 const assert_1 = require("assert");
-const context_1 = require("../agent/context");
+const contextWithWorkspace_1 = require("../agent/contextWithWorkspace");
 const agent_1 = require("../agent/agent");
 const promptProvider_1 = require("../agent/promptProvider");
+const context_1 = require("../agent/context");
+const contextTestTools_1 = require("./contextTestTools");
 describe("ContextManagerWithWorkspace", () => {
     const msgs = [
         { role: "user", content: "message A" },
@@ -12,31 +14,53 @@ describe("ContextManagerWithWorkspace", () => {
         { role: "user", content: "message C" },
         { role: "assistant", content: "message D" },
     ];
-    it("should correctly manage messages", function () {
-        const cm = new context_1.ContextManagerWithWorkspace("sys_msg", msgs.slice(0, 2));
-        // set workspace and add new messages
+    it("context (basic)", async function () {
+        const cm = new context_1.ContextManager("sys_prompt", []);
+        await (0, contextTestTools_1.basicContextTest)(cm);
+    });
+    it("context with workspace (basic)", async function () {
+        const cm = new contextWithWorkspace_1.ContextManagerWithWorkspace("sys_prompt", []);
+        await (0, contextTestTools_1.basicContextTest)(cm);
+    });
+    it("should correctly manage messages", async function () {
+        const cm = new contextWithWorkspace_1.ContextManagerWithWorkspace("sys_msg", msgs.slice(0, 2));
+        // set workspace and add new user and assistant messages
         cm.setWorkspace({ role: "user", content: "workspace1" });
-        cm.addMessages(msgs.slice(2));
-        // context with workspace
-        const ctx1 = cm.getLLMContext();
-        (0, vitest_1.expect)(ctx1).eql([
+        const ctxTx1 = await cm.startTx([msgs[2]]);
+        ctxTx1.addMessage(msgs[3]);
+        // context writer.  workspace should be before first assistant message
+        (0, vitest_1.expect)(ctxTx1.getLLMContext()).eql([
             { role: "system", content: "sys_msg" },
-            ...msgs,
+            ...msgs.slice(0, 3),
+            { role: "user", content: "workspace1" },
+            ...msgs.slice(3),
+        ]);
+        // original cm unchanged
+        (0, vitest_1.expect)(cm.getLLMContext()).eql([
+            { role: "system", content: "sys_msg" },
+            ...msgs.slice(0, 2),
             { role: "user", content: "workspace1" },
         ]);
-        // context with new message and workspace
+        // Commit
+        await cm.commit(ctxTx1);
+        // write new messages
         const lastMsg = {
             role: "user",
             content: "hello",
         };
-        cm.addMessage(lastMsg);
-        const ctx2 = cm.getLLMContext();
-        (0, vitest_1.expect)(ctx2).eql([
+        const ctxTx2 = await cm.startTx([lastMsg]);
+        (0, vitest_1.expect)(ctxTx2.getLLMContext()).eql([
             { role: "system", content: "sys_msg" },
             ...msgs,
             lastMsg,
             { role: "user", content: "workspace1" },
         ]);
+        (0, vitest_1.expect)(cm.getLLMContext()).eql([
+            { role: "system", content: "sys_msg" },
+            ...msgs,
+            { role: "user", content: "workspace1" },
+        ]);
+        await cm.commit(ctxTx2);
         // context without workspace
         cm.setWorkspace(undefined);
         const ctx3 = cm.getLLMContext();
@@ -47,7 +71,7 @@ describe("ContextManagerWithWorkspace", () => {
         ]);
     });
     it("correctly includes all system prompt components", function () {
-        const cm = new context_1.ContextManagerWithWorkspace("agent_prompt", msgs.slice(0, 2));
+        const cm = new contextWithWorkspace_1.ContextManagerWithWorkspace("agent_prompt", msgs.slice(0, 2));
         promptProvider_1.SystemPromptProvider.setGlobalPrompt("global");
         cm.setPromptFragment("frag1", "FRAG1");
         // Get the agentPrompt and llmContext, then undo the global prompt change
@@ -58,8 +82,8 @@ describe("ContextManagerWithWorkspace", () => {
         (0, vitest_1.expect)(agentPrompt).eql("agent_prompt");
         (0, vitest_1.expect)(llmContext[0].content).eql("global\nagent_prompt\nFRAG1");
     });
-    it("handles rich workspace messages", function () {
-        const cm = new context_1.ContextManagerWithWorkspace("sys_msg", msgs.slice(0, 2));
+    it("handles rich workspace messages", async function () {
+        const cm = new contextWithWorkspace_1.ContextManagerWithWorkspace("sys_msg", msgs.slice(0, 2));
         (0, vitest_1.expect)(cm.getLLMContext()).eql([
             { role: "system", content: "sys_msg" },
             ...msgs.slice(0, 2),
@@ -75,7 +99,21 @@ describe("ContextManagerWithWorkspace", () => {
             ...msgs.slice(0, 2),
             wsMsg,
         ]);
-        cm.addMessages(msgs.slice(2));
+        const ctxTx = await cm.startTx([msgs[2]]);
+        (0, vitest_1.expect)(ctxTx.getLLMContext()).eql([
+            { role: "system", content: "sys_msg" },
+            ...msgs.slice(0, 3),
+            wsMsg,
+        ]);
+        ctxTx.addMessage(msgs[3]);
+        (0, vitest_1.expect)(ctxTx.getLLMContext()).eql([
+            { role: "system", content: "sys_msg" },
+            ...msgs.slice(0, 3),
+            wsMsg,
+            msgs[3],
+        ]);
+        (0, vitest_1.expect)(ctxTx.newMessages()).eql(msgs.slice(2, 4));
+        await cm.commit(ctxTx);
         // context with workspace
         const ctx1 = cm.getLLMContext();
         (0, vitest_1.expect)(ctx1).eql([{ role: "system", content: "sys_msg" }, ...msgs, wsMsg]);

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

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MESSAGES = void 0;
+exports.basicContextTest = basicContextTest;
+const vitest_1 = require("vitest");
+exports.MESSAGES = [
+    { role: "user", content: "msg200" },
+    { role: "assistant", content: "msg300" },
+    { role: "user", content: "msg400" },
+    {
+        role: "assistant",
+        content: "msg500",
+        tool_calls: [
+            {
+                id: "tool_call_0",
+                type: "function",
+                function: { name: "tool1", arguments: "" },
+            },
+        ],
+    },
+    {
+        role: "tool",
+        content: "msg501",
+        tool_call_id: "tool_call_0",
+    },
+    { role: "assistant", content: "msg502" },
+];
+async function basicContextTest(cm) {
+    (0, vitest_1.expect)(cm.getAgentPrompt()).eql("sys_prompt");
+    // Add first 2 messages
+    let tx = await cm.startTx([exports.MESSAGES[0]]);
+    tx.addMessage(exports.MESSAGES[1]);
+    (0, vitest_1.expect)(tx.getLLMContext()).eql([
+        {
+            role: "system",
+            content: "sys_prompt",
+        },
+        exports.MESSAGES[0],
+        exports.MESSAGES[1],
+    ]);
+    await cm.commit(tx);
+    // Add more messages
+    tx = await cm.startTx([exports.MESSAGES[2]]);
+    (0, vitest_1.expect)(tx.getLLMContext()).eql([
+        {
+            role: "system",
+            content: "sys_prompt",
+        },
+        exports.MESSAGES[0],
+        exports.MESSAGES[1],
+        exports.MESSAGES[2],
+    ]);
+    tx.addMessages(exports.MESSAGES.slice(3));
+    (0, vitest_1.expect)(tx.getLLMContext()).eql([
+        {
+            role: "system",
+            content: "sys_prompt",
+        },
+        exports.MESSAGES[0],
+        exports.MESSAGES[1],
+        exports.MESSAGES[2],
+        exports.MESSAGES[3],
+        exports.MESSAGES[4],
+        exports.MESSAGES[5],
+    ]);
+    await cm.commit(tx);
+    // Update system prompt
+    cm.setAgentPrompt("New system prompt");
+    // Wait for compression to complete, then get the new context
+    const context = cm.getLLMContext();
+    // Expect
+    //   - callback happened
+    //   - new context is as expected
+    const expectContext = [
+        {
+            role: "system",
+            content: "New system prompt",
+        },
+        exports.MESSAGES[0], // 400
+        exports.MESSAGES[1], // 500
+        exports.MESSAGES[2], // 400
+        exports.MESSAGES[3], // 500
+        exports.MESSAGES[4], // 501
+        exports.MESSAGES[5], // 502
+    ];
+    (0, vitest_1.expect)(context).eql(expectContext);
+}

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

@@ -139,16 +139,15 @@ const server = (0, cmd_ts_1.command)({
         }),
         supabaseUrl: options.supabaseUrl,
         supabaseKey: options.supabaseKey,
-        llmUrl: options.llmUrl,
         xmcpUrl: options.xmcpUrl,
         pidFile: options.pidFile,
     },
     // eslint-disable-next-line @typescript-eslint/require-await
-    handler: async ({ port, supabaseUrl, supabaseKey, llmUrl, xmcpUrl, pidFile, }) => {
+    handler: async ({ port, supabaseUrl, supabaseKey, xmcpUrl, pidFile, }) => {
         if (pidFile) {
             fs.writeFileSync(pidFile, process.pid.toString());
         }
-        void (0, server_1.runServer)(port, supabaseUrl, supabaseKey, llmUrl, xmcpUrl);
+        void (0, server_1.runServer)(port, supabaseUrl, supabaseKey, xmcpUrl);
     },
 });
 const client = (0, cmd_ts_1.command)({
@@ -222,7 +221,9 @@ const client = (0, cmd_ts_1.command)({
   ${chalk_1.default.yellow("/get-file <name>")}    Get file contents
   ${chalk_1.default.yellow("/share-session <file>")} Share and write access token
   ${chalk_1.default.yellow("/pause-agent <0|1>")}  Pause (or unpause) the agent
-  ${chalk_1.default.yellow("/add-mcp-server-url <server-name> <url>")} Add MCP server
+  ${chalk_1.default.yellow("/add-custom-mcp-server <server-name> <url>")} Add MCP server
+  ${chalk_1.default.yellow("/remove-custom-mcp-server <server-name>")} Remove MCP server
+  ${chalk_1.default.yellow("/list-custom-mcp-servers")} list custom mcp servers
   ${chalk_1.default.yellow("/get-resource <server-name> <uri>")} get MCP server resource
 `;
         const cmdPrompt = new commandPrompt_1.CommandPrompt(repl, helpText);
@@ -291,8 +292,14 @@ const client = (0, cmd_ts_1.command)({
                 case "pause-agent":
                     pauseAgent(sessionClient, cmds[1]);
                     break;
-                case "add-mcp-server-url":
-                    addMcpServerFromUrl(sessionClient, cmds[1], cmds[2]);
+                case "add-custom-mcp-server":
+                    addCustomMcpServer(client, cmds[1], cmds[2]);
+                    break;
+                case "remove-custom-mcp-server":
+                    removeCustomMcpServer(client, cmds[1]);
+                    break;
+                case "list-custom-mcp-servers":
+                    listCustomMcpServers(client);
                     break;
                 case "get-resource":
                     await getResource(sessionClient, cmds[1], cmds[2]);
@@ -364,8 +371,15 @@ async function shareSession(sessionClient, filename) {
 function pauseAgent(sessionClient, pause) {
     sessionClient.setAgentPaused(!!parseInt(pause));
 }
-function addMcpServerFromUrl(sessionClient, name, url) {
-    sessionClient.addMcpServerFromUrl(name, url);
+function addCustomMcpServer(chatClient, name, url) {
+    chatClient.addCustomMcpServer(name, "Temporary description", url);
+}
+function removeCustomMcpServer(chatClient, name) {
+    chatClient.removeCustomMcpServer(name);
+}
+function listCustomMcpServers(chatClient) {
+    const customMcpServers = chatClient.getCustomMcpServers();
+    console.log(`Custom mcp serevrs:\n${JSON.stringify(customMcpServers, undefined, 2)}`);
 }
 async function getResource(sessionClient, serverName, resourceUrl) {
     const contents = await sessionClient.getMcpResource(serverName, resourceUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xalia/agent",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "keywords": [],
   "author": "",
   "license": "ISC",

package/scripts/test_chat

@@ -171,6 +171,8 @@ pushd _test_chat
   echo "Choose an animal and generate an image of it" > invoke_gen_image_script
   echo ":list-files" >> invoke_gen_image_script
   echo ":si invoke_gen_image.id" >> invoke_gen_image_script
+  echo ':add-custom-mcp-server custom-mcp http://localhost:8002' >> invoke_gen_image_script
+  echo ':list-custom-mcp-servers' >> invoke_gen_image_script
 
   LOG_LEVEL=debug \
       ${agent} chat client \
@@ -181,6 +183,7 @@ pushd _test_chat
   grep '"xalia/fileMimeType":"image/png"' invoke_gen_image_output.txt
   grep 'structuredContent example' invoke_gen_image_output.txt
   grep '_meta example' invoke_gen_image_output.txt
+  grep 'custom-mcp": ' invoke_gen_image_output.txt
 
   # User 1 tries to join the session.  Should be rejected.