@xalia/agent 0.6.4 → 0.6.5

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

@@ -5,7 +5,7 @@ exports.genImageFileTool = genImageFileTool;
 const sdk_1 = require("@xalia/xmcp/sdk");
 const imageGenerator_1 = require("../../agent/imageGenerator");
 const tools_1 = require("./tools");
-const mimeTypes_1 = require("../data/mimeTypes");
+const dbSessionFileModels_1 = require("../data/dbSessionFileModels");
 const logger = (0, sdk_1.getLogger)();
 function createImageGenerator(llmUrl, llmApiKey) {
     const imageGenModel = process.env["GEN_IMAGE_MODEL"];
@@ -97,10 +97,13 @@ async function genImageFileTool(llmUrl, llmApiKey, fileManager) {
             ? await fileManager.getFileContent(input_name)
             : undefined;
         const image = await imageGenerator.generate(prompt, input_image);
-        const mimeType = (0, mimeTypes_1.getMimeTypeFromDataUrl)(image);
+        const mimeType = (0, dbSessionFileModels_1.getSessionFileMimeTypeFromDataUrl)(image);
         await fileManager.putFileContent(name, summary, image);
-        const url = fileManager.getSessionFileRelativeUrl(name);
-        return { response: url, metadata: { type: mimeType } };
+        const uri = fileManager.getSessionFileRelativeUrl(name);
+        return {
+            response: uri,
+            _meta: { "xalia/fileUri": uri, "xalia/fileMimeType": mimeType },
+        };
     };
     return {
         // eslint-disable-next-line @typescript-eslint/require-await

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

@@ -91,7 +91,7 @@ class ChatSessionPlatform {
     }
     // IPlatform.load
     load(filename) {
-        if (process.env.DEVELOPMENT === "1") {
+        if (!process.env.NO_DEVELOPMENT) {
             return nodePlatform_1.NODE_PLATFORM.load(filename);
         }
         throw new errors_1.ChatErrorMessage("Platform.load not implemented");
@@ -211,6 +211,7 @@ class OpenSession {
         this.sessionUpdatedAt = sessionData.updated_at;
         this.agentPaused = sessionData.agent_paused;
         fileManager.addEventHandler(this);
+        this.updateParticipantsPrompt();
     }
     static async init(db, isPersisted, sessionData, savedAgentProfile, sessionMessages, sessionParticipants, ownerData, ownerApiKey, sessionCheckpoint, llmUrl, xmcpUrl, connectionManager) {
         const sessionId = sessionData.session_uuid;
@@ -365,8 +366,11 @@ class OpenSession {
      * is and `true` is returned.  Otherwise false is returned (and the caller
      * is expected to re-throw if they are unable to handle it).
      */
-    handleError(err, from) {
+    handleError(err, from, client_message_id) {
         const sendError = (msg) => {
+            if (client_message_id) {
+                msg.client_message_id = client_message_id;
+            }
             if (from) {
                 this.sender.sendTo(from, msg);
             }
@@ -458,11 +462,13 @@ class OpenSession {
         servers.forEach((server_name) => {
             const mcpServer = this.skillManager.getMcpServer(server_name);
             const tools = mcpServer.getTools();
+            const resources = mcpServer.getResources();
             const enabled_tools = Array.from(mcpServer.getEnabledTools().keys());
             this.sender.connectionManager.sendToConnection(connectionId, {
                 type: "mcp_server_added",
                 server_name,
                 tools,
+                resources,
                 enabled_tools,
                 session_id: this.sessionUUID,
             });
@@ -535,6 +541,12 @@ class OpenSession {
                 case "share_session":
                     await this.handleShareSession(msg, queuedMessage.from);
                     break;
+                case "add_mcp_server_from_url":
+                    void this.handleAddMcpServerFromUrl(msg, queuedMessage.from);
+                    break;
+                case "get_mcp_resource":
+                    void this.handleGetMcpResource(msg, queuedMessage.from);
+                    break;
                 default: {
                     const exhaustive = msg; // Error => non-exhaustive switch-case.
                     return exhaustive;
@@ -570,6 +582,44 @@ class OpenSession {
             session_id: this.sessionUUID,
         });
     }
+    async handleAddMcpServerFromUrl(msg, from) {
+        const skillManager = this.skillManager;
+        try {
+            const serverName = msg.server_name;
+            await skillManager.addMcpServerWithStreamableHTTPUrl(serverName, msg.url);
+            this.skillManager.enableAllTools(serverName);
+            const server = skillManager.getMcpServer(serverName);
+            const tools = server.getTools();
+            const resources = server.getResources();
+            const enabled_tools = Array.from(server.getEnabledTools().keys());
+            this.sender.broadcast({
+                type: "mcp_server_added",
+                server_name: serverName,
+                tools,
+                resources,
+                enabled_tools,
+                session_id: this.sessionUUID,
+            });
+        }
+        catch (err) {
+            this.handleError(err, from);
+        }
+    }
+    async handleGetMcpResource(msg, from) {
+        try {
+            const contents = await this.skillManager.getResource(msg.server_name, msg.uri);
+            this.sender.sendTo(from, {
+                type: "mcp_resource",
+                session_id: this.sessionUUID,
+                client_message_id: msg.client_message_id,
+                server_name: msg.server_name,
+                contents,
+            });
+        }
+        catch (err) {
+            this.handleError(err, from, msg.client_message_id);
+        }
+    }
     async handleSetWorkspace(msg, sender) {
         this.contextManager.setWorkspace((0, agent_1.createUserMessage)(msg.message, msg.imageB64, sender));
         const m = this.workspaceUserMessageData();
@@ -730,11 +780,13 @@ class OpenSession {
         // Broadcast the message to all participants.
         const server = this.skillManager.getMcpServer(serverName);
         const tools = server.getTools();
+        const resources = server.getResources();
         const enabled_tools = Array.from(server.getEnabledTools().keys());
         return {
             type: "mcp_server_added",
             server_name: serverName,
             tools,
+            resources,
             enabled_tools,
             session_id: this.sessionUUID,
         };
@@ -857,15 +909,20 @@ class OpenSession {
         // TODO: Do we want to braodcast an "mcp_server_config_updated" message?
     }
     async handleSessionFileGetContent(msg, from) {
-        const data_url = await this.sessionFileManager.getFileContent(msg.name);
-        const contentMsg = {
-            type: "session_file_content",
-            session_id: this.sessionUUID,
-            client_message_id: msg.client_message_id,
-            name: msg.name,
-            data_url,
-        };
-        this.sender.sendTo(from, contentMsg);
+        try {
+            const data_url = await this.sessionFileManager.getFileContent(msg.name);
+            const contentMsg = {
+                type: "session_file_content",
+                session_id: this.sessionUUID,
+                client_message_id: msg.client_message_id,
+                name: msg.name,
+                data_url,
+            };
+            this.sender.sendTo(from, contentMsg);
+        }
+        catch (err) {
+            this.handleError(err, from);
+        }
     }
     async handleSessionFileDelete(msg) {
         await this.sessionFileManager.deleteFile(msg.name);
@@ -918,6 +975,7 @@ class OpenSession {
             email: participant.email,
             session_id: this.sessionUUID,
         };
+        this.updateParticipantsPrompt();
         this.sender.broadcast(broadcastMessage);
     }
     /**
@@ -973,6 +1031,21 @@ class OpenSession {
             session_id: this.sessionUUID,
         };
     }
+    updateParticipantsPrompt() {
+        const participants = this.sessionParticipants;
+        function* promptStrings() {
+            yield "The following map is from user_uuids to real names. In user ";
+            yield 'messages, real names (or derivatives e.g. "Joe" for "Joe ';
+            yield 'Bloggs") will be used to refer to users. Similarly, your ';
+            yield "responses should also use real names.\n";
+            for (const [user_uuid, participant] of participants.entries()) {
+                yield `${user_uuid}: ${participant.nickname}\n`;
+            }
+        }
+        const prompt = Array.from(promptStrings()).join("");
+        logger.info(`[OpenSession.updateParticipantsPrompt] prompt: ${prompt}`);
+        this.contextManager.setPromptFragment("participants", prompt);
+    }
 }
 exports.OpenSession = OpenSession;
 async function loadDataForEmptySession(db, agent_profile_uuid, owner_uuid) {
@@ -1029,6 +1102,6 @@ async function createContextAndAgent(sessionUUID, systemPrompt, model, sessionMe
     const eventHandler = new ChatSessionAgentEventHandler(sessionUUID, sender, approvalManager, contextManager);
     const xmcpConfig = sdk_1.Configuration.new(ownerApiKey, xmcpUrl, false);
     const [agent, skillManager] = await (0, agentUtils_1.createAgentWithoutSkills)(llmUrl, model, eventHandler, platform, contextManager, ownerApiKey, xmcpConfig, undefined, true);
-    await (0, tools_1.addDefaultChatTools)(agent, ownerData.timezone, platform, fileManager, llmUrl, ownerApiKey);
+    await (0, tools_1.addDefaultChatTools)(agent, ownerData.timezone, fileManager, llmUrl, ownerApiKey);
     return { agent, skillManager, contextManager };
 }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatSessionFileManager = exports.MemoryFileManager = void 0;
-exports.listFilesForLLM = listFilesForLLM;
+exports.createSessionFilesManagerPrompt = createSessionFilesManagerPrompt;
 exports.fileManagerTool = fileManagerTool;
 const uuid_1 = require("uuid");
 const assert_1 = require("assert");
@@ -174,16 +174,19 @@ exports.ChatSessionFileManager = ChatSessionFileManager;
 /**
  * Return the file list in a form easily parsable by the LLM.
  */
-function listFilesForLLM(fm) {
+function createSessionFilesManagerPrompt(fm) {
     const files = fm.listFiles();
     if (files.length === 0) {
         return "";
     }
-    let summary = "Available files:\nname,type,summary\n";
+    let prompt = "Files can be read/written as required. Create new files conservatively, " +
+        "usually when complex content is requested. Use base64 for binary (image," +
+        "pdf), ascii for text formats (html,markdown). " +
+        "Available files:\nname,type,summary\n";
     for (const f of files) {
-        summary += `${f.name},${f.mime_type},${f.summary || ""}\n`;
+        prompt += `${f.name},${f.mime_type},${f.summary || ""}\n`;
     }
-    return summary;
+    return prompt;
 }
 const GET_FILE_CONTENT_TOOL = {
     type: "function",
@@ -266,8 +269,16 @@ function fileManagerTool(fileManager) {
         const parsed = parseNameSummaryDataUrl(args);
         const { name, summary, data_url } = parsed;
         const desc = await fileManager.putFileContent(name, summary, data_url);
+        const mimeType = (0, dbSessionFileModels_1.getSessionFileMimeTypeFromDataUrl)(data_url);
         parsed.data_url = fileManager.getSessionFileRelativeUrl(name);
-        return { response: desc.name, overwriteArgs: JSON.stringify(parsed) };
+        return {
+            response: desc.name,
+            overwriteArgs: JSON.stringify(parsed),
+            _meta: {
+                "xalia/fileUri": parsed.data_url,
+                "xalia/fileMimeType": mimeType,
+            },
+        };
     };
     // `delete_file_content` tool
     //

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

@@ -554,7 +554,7 @@ class SessionRegistry {
             agentProfileFromTemplate = template.agent_profile;
         }
         const newAgentProfile = agentProfileFromTemplate ||
-            new sdk_1.AgentProfile(sdk_1.DEFAULT_AGENT_PROFILE.model, sdk_1.DEFAULT_AGENT_PROFILE.system_prompt, sdk_1.DEFAULT_AGENT_PROFILE.mcp_settings);
+            new sdk_1.AgentProfile(message.model || sdk_1.DEFAULT_AGENT_PROFILE.model, sdk_1.DEFAULT_AGENT_PROFILE.system_prompt, sdk_1.DEFAULT_AGENT_PROFILE.mcp_settings);
         const team_uuid = message.team_uuid || undefined;
         if (team_uuid) {
             // TODO: should be able to reconstruct the full SavedAgentProfile in one

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

@@ -3,7 +3,7 @@
  * Collection of simple Agent tools.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculatorTool = void 0;
+exports.testTool = exports.calculatorTool = void 0;
 exports.makeParseArgsFn = makeParseArgsFn;
 exports.isoWithTimezone = isoWithTimezone;
 exports.datetimeTool = datetimeTool;
@@ -14,12 +14,13 @@ exports.openURL = openURL;
 exports.openURLTool = openURLTool;
 exports.addDefaultChatTools = addDefaultChatTools;
 const expr_eval_1 = require("expr-eval");
-const htmlToText_1 = require("../utils/htmlToText");
 const sdk_1 = require("@xalia/xmcp/sdk");
+const htmlToText_1 = require("../utils/htmlToText");
 const search_1 = require("../utils/search");
 const sessionFileManager_1 = require("./sessionFileManager");
 const imageGeneratorTools_1 = require("./imageGeneratorTools");
 const logger = (0, sdk_1.getLogger)();
+const DEVELOPMENT = process.env.DEVELOPMENT === "1";
 /**
  * Returns a function which parses an `args` struct and attempts to extract
  * multiple string parameters with the given names.  e.g.
@@ -147,21 +148,39 @@ const RENDER_DESC = {
         parameters: {
             type: "object",
             properties: {
+                name: {
+                    type: "string",
+                    description: "Filename to store the html",
+                },
+                summary: {
+                    type: "string",
+                    description: "One line summary",
+                },
                 html: {
                     type: "string",
                     description: "HTML fragment to render",
                 },
             },
-            required: ["html"],
+            required: ["name", "summary", "html"],
         },
     },
 };
-function renderTool(platform) {
-    const getHtml = makeParseArgsFn(["html"]);
+function renderTool(fileManager) {
+    const getNameSummeryHtml = makeParseArgsFn([
+        "name",
+        "summary",
+        "html",
+    ]);
     const toolFn = async (_, args) => {
-        const { html } = getHtml(args);
-        await platform.renderHTML(html);
-        return { response: "" };
+        const { name, summary, html } = getNameSummeryHtml(args);
+        const mimeType = "text/html";
+        const dataURL = `data:${mimeType},${html}`;
+        await fileManager.putFileContent(name, summary, dataURL);
+        const uri = fileManager.getSessionFileRelativeUrl(name);
+        return {
+            response: "",
+            _meta: { "xalia/fileUri": uri, "xalia/fileMimeType": mimeType },
+        };
     };
     return {
         // eslint-disable-next-line @typescript-eslint/require-await
@@ -250,15 +269,44 @@ function openURLTool() {
         },
     };
 }
+const TEST_DESC = {
+    type: "function",
+    function: {
+        name: "test_tool",
+        description: "Call me when asked to test tools",
+        parameters: {
+            type: "object",
+            properties: {},
+            required: [],
+        },
+    },
+};
+exports.testTool = {
+    setup: (agent) => {
+        const toolFn = (_agent, _args) => {
+            // Return an object with structuredContent and _meta
+            return Promise.resolve({
+                response: "Some text",
+                structuredContent: { description: "structuredContent example" },
+                _meta: { description: "_meta example" },
+            });
+        };
+        agent.addAgentTool(TEST_DESC, toolFn);
+        return Promise.resolve();
+    },
+};
 /**
  * Add a set of agent tools for chat sessions.
  */
-async function addDefaultChatTools(agent, timezone, platform, fileManager, llmUrl, llmApiKey) {
+async function addDefaultChatTools(agent, timezone, fileManager, llmUrl, llmApiKey) {
     await agent.addAgentToolProvider(datetimeTool(timezone));
     await agent.addAgentToolProvider(exports.calculatorTool);
-    await agent.addAgentToolProvider(renderTool(platform));
+    await agent.addAgentToolProvider(renderTool(fileManager));
     await agent.addAgentToolProvider(webSearchTool());
     await agent.addAgentToolProvider(openURLTool());
     await agent.addAgentToolProvider((0, sessionFileManager_1.fileManagerTool)(fileManager));
     await agent.addAgentToolProvider(await (0, imageGeneratorTools_1.genImageFileTool)(llmUrl, llmApiKey, fileManager));
+    if (DEVELOPMENT) {
+        await agent.addAgentToolProvider(exports.testTool);
+    }
 }

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

@@ -75,7 +75,7 @@ function createCallTestToolScript(tool_call_ids, param1, param2) {
         return new Promise((r) => {
             r({
                 response: `tool_result: '${param1}' '${String(param2)}'`,
-                metadata: { type: "text/plain" },
+                _meta: { type: "text/plain" },
             });
         });
     };
@@ -96,7 +96,7 @@ function createCallTestToolScript(tool_call_ids, param1, param2) {
             content: `tool_result: '${param1}' '${String(param2)}'`,
             role: "tool",
             tool_call_id: id,
-            metadata: { type: "text/plain" },
+            _meta: { type: "text/plain" },
         });
     }
     // Second tool call (if requested) is tool0
@@ -370,4 +370,28 @@ describe("Agent", () => {
         // Check the Agent has not added the user messages.
         (0, vitest_1.expect)(ctxMgr.getLLMContext().length).eql(1);
     });
+    it("supports reasoning token callbacks", async function () {
+        const script = [
+            {
+                finish_reason: "reasoning",
+                message: "Some reasoning tokens...",
+            },
+            {
+                index: 0,
+                finish_reason: "stop",
+                message: {
+                    content: "Agent Message",
+                    refusal: null,
+                    role: "assistant",
+                },
+                logprobs: null,
+            },
+        ];
+        const llm = new testTools_1.TestDummyLLM(script);
+        const eventHandler = new testTools_1.TestAgentEventHandler();
+        const ctxMgr = new context_1.ContextManager("SYSTEM_PROMPT", []);
+        const agent = agent_1.Agent.initializeWithLLM(eventHandler, llm, ctxMgr);
+        await agent.userMessageEx("user message 1");
+        (0, vitest_1.expect)(eventHandler.getReasoning()).eql([script[0].message, ""]);
+    });
 });

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

@@ -47,7 +47,7 @@ const MESSAGES = [
             role: "tool",
             content: "msg501",
             tool_call_id: "tool_call_0",
-            metadata: { type: "text/plain" },
+            _meta: { type: "text/plain" },
         },
     },
     {
@@ -88,7 +88,7 @@ function testSuccessfulAgentLoop(cm, startIdx) {
     (0, vitest_1.expect)(llmUserMessages).eql(userMsgs.map((su) => {
         return {
             role: "user",
-            name: su.user_nickname,
+            name: su.user_uuid,
             content: su.message,
         };
     }));
@@ -187,13 +187,13 @@ function testSuccessfulAgentLoop(cm, startIdx) {
             message_idx: startIdx + 0,
             sender_uuid: "user0",
             is_for_llm: true,
-            content: (0, agent_1.createUserMessageEnsure)(userMsgs[0].message, userMsgs[0].imageB64, "User0"),
+            content: (0, agent_1.createUserMessageEnsure)(userMsgs[0].message, userMsgs[0].imageB64, "user0"),
         },
         {
             message_idx: startIdx + conversation_1.MESSAGE_INDEX_FULL_INCREMENT,
             sender_uuid: "user1",
             is_for_llm: true,
-            content: (0, agent_1.createUserMessageEnsure)(userMsgs[1].message, userMsgs[1].imageB64, "User1"),
+            content: (0, agent_1.createUserMessageEnsure)(userMsgs[1].message, userMsgs[1].imageB64, "user1"),
         },
         // agent response with tool calls
         {
@@ -329,7 +329,7 @@ describe("IndexingCompressingContextManager", () => {
         (0, vitest_1.expect)(llmUserMessages).eql([
             {
                 role: "user",
-                name: serverUserMessage0.user_nickname,
+                name: serverUserMessage0.user_uuid,
                 content: serverUserMessage0.message,
             },
         ]);

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/require-await */
 const vitest_1 = require("vitest");
+const assert_1 = require("assert");
 const mcpServerManager_1 = require("../agent/mcpServerManager");
 // Handle automatically closing at the end of tests.
 let managers = {};
@@ -41,7 +42,10 @@ async function shutdownAll() {
         {
             const qualifiedName = tm.getOpenAITools()[0].function.name;
             const r = await tm.invoke(tm.verifyToolCall(qualifiedName, { a: 1000, b: 10 }));
-            console.log(`response: ${r}`);
+            (0, assert_1.strict)(r._meta);
+            (0, assert_1.strict)((0, mcpServerManager_1.isMcpServerToolCallMetaData)(r._meta));
+            (0, vitest_1.expect)(r._meta["xalia/mcpServerName"]).eql("simplecalc");
+            console.log(`response: ${JSON.stringify(r)}`);
         }
         // Disable and check we don't get the spec anymore
         {

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

@@ -81,6 +81,9 @@ class TestAgentEventHandler {
     getToolCallResults() {
         return this.toolCallResults;
     }
+    getReasoning() {
+        return this.reasoning;
+    }
 }
 exports.TestAgentEventHandler = TestAgentEventHandler;
 /**
@@ -92,9 +95,9 @@ class TestDummyLLM extends dummyLLM_1.DummyLLM {
         super(script);
         this.requests = [];
     }
-    getConversationResponse(messages, tools, onMessage) {
+    getConversationResponse(messages, tools, onMessage, onReasoning) {
         this.requests.push({ messages, tools });
-        return super.getConversationResponse(messages, tools, onMessage);
+        return super.getConversationResponse(messages, tools, onMessage, onReasoning);
     }
     getRequests() {
         return this.requests;

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

@@ -54,6 +54,7 @@ const options = __importStar(require("./options"));
 const commandPrompt_1 = require("./commandPrompt");
 const nodePlatform_1 = require("./nodePlatform");
 const files_1 = require("./files");
+const dbSessionFileModels_1 = require("../chat/data/dbSessionFileModels");
 const logger = (0, sdk_1.getLogger)();
 const listSessions = (0, cmd_ts_1.command)({
     name: "delete-session",
@@ -221,6 +222,8 @@ 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("/get-resource <server-name> <uri>")} get MCP server resource
 `;
         const cmdPrompt = new commandPrompt_1.CommandPrompt(repl, helpText);
         const eventHandler = getCLIEventHandler(cmdPrompt);
@@ -288,6 +291,12 @@ 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]);
+                    break;
+                case "get-resource":
+                    await getResource(sessionClient, cmds[1], cmds[2]);
+                    break;
                 default:
                     console.log(`error: Unknown command ${cmds[0]}`);
             }
@@ -355,6 +364,13 @@ async function shareSession(sessionClient, filename) {
 function pauseAgent(sessionClient, pause) {
     sessionClient.setAgentPaused(!!parseInt(pause));
 }
+function addMcpServerFromUrl(sessionClient, name, url) {
+    sessionClient.addMcpServerFromUrl(name, url);
+}
+async function getResource(sessionClient, serverName, resourceUrl) {
+    const contents = await sessionClient.getMcpResource(serverName, resourceUrl);
+    console.log(`resource: (${serverName}) ${resourceUrl}: ${JSON.stringify(contents)}`);
+}
 function setWorkspaceFromPrompt(sessionClient, cmds) {
     let msg = "";
     let image = undefined;
@@ -450,9 +466,10 @@ function getCLIEventHandler(cmdPrompt) {
                 break;
             case "tool_call_result":
                 {
-                    const metadata = msg.result.metadata;
-                    if (metadata) {
-                        console.log(`tool call result metadata: ${JSON.stringify(metadata)}`);
+                    console.log(`tool call result: ${JSON.stringify(msg.result)}`);
+                    const metadata = msg.result._meta;
+                    if ((0, dbSessionFileModels_1.isFileMetaData)(metadata)) {
+                        console.log(`filemanager file: ${JSON.stringify(metadata)}`);
                         // SessionFiles should already hold the file information.
                         const sessionFiles = sessionClient.getSessionFiles();
                         const { name } = sessionFiles.decodeSessionFileUrl(msg.result.content);
@@ -470,6 +487,9 @@ function getCLIEventHandler(cmdPrompt) {
                     r(true);
                 }), msg.display_name);
                 break;
+            case "session_error":
+                process_1.stdout.write(chalk_1.default.red(`session_error(${msg.session_id}): ${msg.message}`));
+                break;
             default:
                 process_1.stdout.write(`(unrecognised) ${JSON.stringify(msg.type)}\n`);
                 break;

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

@@ -38,7 +38,6 @@ exports.loadFileOrStdin = loadFileOrStdin;
 exports.loadImageAsDataUrl = loadImageAsDataUrl;
 exports.loadSessionFileAsDataUrl = loadSessionFileAsDataUrl;
 exports.loadImageAsDataUrlOrUndefined = loadImageAsDataUrlOrUndefined;
-exports.loadServerUrls = loadServerUrls;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const dbSessionFileModels_1 = require("../chat/data/dbSessionFileModels");
@@ -99,29 +98,3 @@ function loadImageAsDataUrlOrUndefined(file) {
     }
     return undefined;
 }
-function loadServerUrls(path) {
-    try {
-        const file = fs.readFileSync(path, "utf-8");
-        const urls = JSON.parse(file);
-        // Validate the structure
-        if (typeof urls !== "object" || urls === null) {
-            throw new Error("Invalid server URLs format: must be an object");
-        }
-        // Validate each URL is a string
-        for (const [key, value] of Object.entries(urls)) {
-            if (typeof value !== "string") {
-                throw new Error(`Invalid URL format for server ${key}: must be a string`);
-            }
-        }
-        return urls;
-    }
-    catch (error) {
-        if (error instanceof SyntaxError) {
-            throw new Error(`Invalid JSON in server URLs file: ${error.message}`);
-        }
-        if (error instanceof Error) {
-            throw new Error(`Failed to load server URLs: ${error.message}`);
-        }
-        throw error;
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xalia/agent",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -18,7 +18,7 @@
     "test": "yarn build && vitest run"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "=1.11.1",
+    "@modelcontextprotocol/sdk": "=1.20.1",
     "@supabase/supabase-js": "2.49.7",
     "@types/readline-sync": "^1.4.8",
     "chalk": "^4.1.2",
@@ -30,7 +30,7 @@
     "google-search-ts": "^1.0.1",
     "html-to-text": "^9.0.5",
     "node-fetch": "^3.3.2",
-    "openai": "=4.98.0",
+    "openai": "=6.3.0",
     "readline-sync": "^1.4.10",
     "uuid": "^11.1.0",
     "ws": "8.18.2",

package/scripts/test_chat

@@ -178,7 +178,9 @@ pushd _test_chat
       --agent-profile-id ${invoke_gen_image_profile_id} \
       --script invoke_gen_image_script | tee invoke_gen_image_output.txt
   grep 'frog.png' invoke_gen_image_output.txt
-  grep 'metadata: {"type":"image/png"}' invoke_gen_image_output.txt
+  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
 
   # User 1 tries to join the session.  Should be rejected.