@xalia/agent 0.6.8 → 0.6.9

package/src/agent/sudoMcpServerManager.ts

@@ -14,6 +14,7 @@ import {
   McpServer,
 } from "@xalia/xmcp/sdk";
 import { Client as McpClient } from "@modelcontextprotocol/sdk/client/index.js";
+import { CustomMcpServerDescriptor } from "../chat/data/dataModels";
 
 const DEVELOPMENT: boolean = process.env.DEVELOPMENT === "1";
 
@@ -31,7 +32,7 @@ class SanitizedServerBrief extends McpServerBrief {
   readonly originalName: string;
 
   private constructor() {
-    super("dummy", "dummy", "dummy", false, {}, "dummy", "dummy");
+    super("dummy", "dummy", "dummy", false, {}, "dummy", null, null, undefined);
     this.originalName = "dummy";
   }
 
@@ -79,7 +80,8 @@ export class SkillManager extends McpServerManager implements ISkillManager {
       displayName: string
     ) => void,
     // Redirect to this page after successful authorization
-    private authorized_url: string | undefined
+    private authorized_url: string | undefined,
+    private customMcpServers: Record<string, CustomMcpServerDescriptor>
   ) {
     super();
   }
@@ -96,7 +98,8 @@ export class SkillManager extends McpServerManager implements ISkillManager {
     ) => void,
     sudoMcpUrl?: string,
     sudoMcpApiKey?: string,
-    authorized_url?: string
+    authorized_url?: string,
+    customMcpServers?: Record<string, CustomMcpServerDescriptor>
   ): Promise<SkillManager> {
     // TODO: Keep it on here and pass to `McpServerManager.addMcpServer`
     const apiClient = new ApiClient(
@@ -106,31 +109,29 @@ export class SkillManager extends McpServerManager implements ISkillManager {
     // Fetch server list
     const servers = await apiClient.listServers();
 
+    customMcpServers = customMcpServers || {};
     if (DEVELOPMENT) {
-      servers.push(
-        new McpServerBrief(
-          "local_dev",
-          "Local Dev Server",
+      customMcpServers["local_dev"] = {
+        name: "local_dev",
+        description:
           "A local mcp server using streamable-HTTP for development use.  " +
-            `URL: ${DEV_MCP_SERVER_URL}`,
-          false,
-          {},
-          "",
-          null,
-          null,
-          DEV_MCP_SERVER_URL
-        )
-      );
+          `URL: ${DEV_MCP_SERVER_URL}`,
+        url: DEV_MCP_SERVER_URL,
+      };
     }
 
-    const [mcpServers, mcpServersMap] = buildServersList(servers);
+    const [mcpServers, mcpServersMap] = buildServersList(
+      servers,
+      customMcpServers
+    );
     return new SkillManager(
       apiClient,
       mcpServers,
       mcpServersMap,
       new Map(),
       openUrl,
-      authorized_url
+      authorized_url,
+      customMcpServers
     );
   }
 
@@ -188,7 +189,10 @@ export class SkillManager extends McpServerManager implements ISkillManager {
    */
   public async refresh(): Promise<void> {
     const servers = await this.apiClient.listServers();
-    const [mcpServers, mcpServersMap] = buildServersList(servers);
+    const [mcpServers, mcpServersMap] = buildServersList(
+      servers,
+      this.customMcpServers
+    );
     this.serverBriefs = mcpServers;
     this.serverBriefsMap = mcpServersMap;
     this.toolCache = new Map();
@@ -321,7 +325,8 @@ async function connectServer(
  * holding the original name in a new field).
  */
 function buildServersList(
-  serverList: McpServerBrief[]
+  serverList: McpServerBrief[],
+  customServers: Record<string, CustomMcpServerDescriptor>
 ): [SanitizedServerBrief[], { [serverName: string]: SanitizedServerBrief }] {
   const servers: SanitizedServerBrief[] = [];
   const serversMap: { [serverName: string]: SanitizedServerBrief } = {};
@@ -332,6 +337,22 @@ function buildServersList(
     serversMap[ss.name] = ss;
   }
 
+  for (const [name, desc] of Object.entries(customServers)) {
+    const brief = new McpServerBrief(
+      name,
+      desc.name,
+      desc.description,
+      false,
+      {},
+      "",
+      null,
+      null,
+      desc.url
+    );
+    const ss = SanitizedServerBrief.fromServerBrief(brief);
+    servers.push(ss);
+    serversMap[ss.name] = ss;
+  }
   return [servers, serversMap];
 }
 

package/src/chat/client/chatClient.ts

@@ -28,6 +28,8 @@ import {
   ServerControlAgentProfileCreated,
   ServerControlAgentProfileDeleted,
   ClientControlSessionCreate,
+  ServerControlCustomMcpServerAdded,
+  ServerControlCustomMcpServerRemoved,
 } from "../protocol/messages";
 import { SESSION_JOIN_TIMEOUT } from "./constants";
 import { ITeamManager } from "./teamManager";
@@ -81,6 +83,8 @@ export class ChatClient implements ITeamManager {
     JoinCreateResponse,
     CreatedClient
   >;
+  // server_name => url
+  private customMcpServers: Map<string, string>;
 
   private constructor(
     connection: Connection<ClientToServer, ServerToClient>,
@@ -106,6 +110,7 @@ export class ChatClient implements ITeamManager {
       this.onJoinCreateResponse.bind(this),
       Math.max(SESSION_JOIN_TIMEOUT)
     );
+    this.customMcpServers = new Map();
   }
 
   /**
@@ -537,6 +542,26 @@ export class ChatClient implements ITeamManager {
     }
   }
 
+  getCustomMcpServers(): Record<string, string> {
+    return Object.fromEntries(this.customMcpServers.entries());
+  }
+
+  addCustomMcpServer(server_name: string, description: string, url: string) {
+    this.connection.send({
+      type: "control_add_custom_mcp_server",
+      server_name,
+      description,
+      url,
+    });
+  }
+
+  removeCustomMcpServer(server_name: string) {
+    this.connection.send({
+      type: "control_remove_custom_mcp_server",
+      server_name,
+    });
+  }
+
   /**
    * Delete a session from the agent session map
    * @param agentSessionMap - the agent session map
@@ -618,6 +643,12 @@ export class ChatClient implements ITeamManager {
       case "control_team_members_updated":
         this.handleTeamMembersUpdated(msg);
         break;
+      case "control_custom_mcp_server_added":
+        this.handleCustomMcpServerAdded(msg);
+        break;
+      case "control_custom_mcp_server_removed":
+        this.handleCustomMcpServerRemoved(msg);
+        break;
       default: {
         const _exhaustive: never = msg;
         throw new Error(`unexpected control msg: ${JSON.stringify(msg)}`);
@@ -701,8 +732,11 @@ export class ChatClient implements ITeamManager {
       const sessionClient = this.activeSessions.get(sessionId);
       if (sessionClient) {
         sessionClient.handleMessage(msg);
-        // we are only calling the onMessage for session scoped message for now.
-        void this.eventHandler.onMessage(msg, this);
+        // Only forward messages to UI if they're for the current session
+        // This prevents streaming messages from leaking into other chats
+        if (sessionId === this.currentSessionId) {
+          void this.eventHandler.onMessage(msg, this);
+        }
       } else {
         throw new Error(`Session client not found for session ${sessionId}`);
       }
@@ -773,7 +807,7 @@ export class ChatClient implements ITeamManager {
     this.upsertSessionToAgentSessionMap(msg);
   }
 
-  handleControlError(msg: ServerControlError): void {
+  private handleControlError(msg: ServerControlError): void {
     if (this.sessionJoinAwaiter.onMessage(msg)) {
       return;
     }
@@ -833,6 +867,16 @@ export class ChatClient implements ITeamManager {
     agentSession.updated_at = new Date(msg.updated_at).getTime();
   }
 
+  private handleCustomMcpServerAdded(msg: ServerControlCustomMcpServerAdded) {
+    this.customMcpServers.set(msg.server_name, msg.url);
+  }
+
+  private handleCustomMcpServerRemoved(
+    msg: ServerControlCustomMcpServerRemoved
+  ) {
+    this.customMcpServers.delete(msg.server_name);
+  }
+
   // This is the immediate callback of the ResponseAwaiter for session
   // joining.  It must create and register the client.
   private onJoinCreateResponse(msg: JoinCreateResponse): CreatedClient {

package/src/chat/client/connection.ts

@@ -108,7 +108,17 @@ export class Connection<ClientMsgT extends MsgBase, ServerMsgT extends MsgBase>
   ): void {
     if (this.state === "ready" && this.ws) {
       const data = JSON.stringify(message);
-      logger.debug(`[Connection.send] ${data}`);
+      
+      // Truncate base64 image data for logging to avoid console spam
+      let logData = data;
+      if (data.includes('"imageB64":"data:image/')) {
+        logData = data.replace(
+          /"imageB64":"data:image\/[^"]+"/,
+          '"imageB64":"<base64 image data truncated>"'
+        );
+      }
+      logger.debug(`[Connection.send] ${logData}`);
+      
       this.ws.send(data);
     } else {
       throw new Error(`Cannot send message: connection state is ${this.state}`);

package/src/chat/client/sessionClient.ts

@@ -309,14 +309,6 @@ export class SessionClient implements ISessionMessageSender, IConversation {
     });
   }
 
-  addMcpServerFromUrl(server_name: string, url: string) {
-    this.sendSessionMessage({
-      type: "add_mcp_server_from_url",
-      server_name,
-      url,
-    });
-  }
-
   async getMcpResource(
     server_name: string,
     uri: string

package/src/chat/data/dataModels.ts

@@ -93,3 +93,9 @@ export type TeamInfo = {
  * Map from user_uuid to role
  */
 export type SessionParticipantMap = Map<string, TeamParticipant>;
+
+export type CustomMcpServerDescriptor = {
+  name: string;
+  description: string;
+  url: string;
+};

package/src/chat/data/dbSessionMessages.ts

@@ -65,4 +65,38 @@ export class DbSessionMessages extends DbClientBase {
       throw error;
     }
   }
+
+  async searchMessages(
+    userUuid: string,
+    searchQuery: string,
+    limit = 50
+  ): Promise<
+    Array<{
+      session_uuid: string;
+      message_idx: number;
+      sender_uuid?: string;
+      content: unknown;
+      match_snippet: string;
+    }>
+  > {
+    type SearchResult = {
+      session_uuid: string;
+      message_idx: number;
+      sender_uuid?: string;
+      content: unknown;
+      match_snippet: string;
+    };
+
+    const result = await this.client.rpc("search_session_messages", {
+      p_user_uuid: userUuid,
+      p_search_query: searchQuery,
+      p_limit: limit,
+    });
+
+    if (result.error) {
+      throw result.error;
+    }
+
+    return (result.data as SearchResult[] | null) || [];
+  }
 }

package/src/chat/protocol/messages.ts

@@ -13,6 +13,7 @@ import {
   TeamParticipant,
   UserMessageData,
   SessionDescriptor,
+  CustomMcpServerDescriptor,
 } from "../data/dataModels";
 import { SessionFileDescriptor } from "../data/dbSessionFileModels";
 import {
@@ -114,6 +115,18 @@ export type ClientControlRemoveTeamUser = {
   target_team_id: string;
 } & ClientToServerBase;
 
+export type ClientControlAddCustomMcpServer = {
+  type: "control_add_custom_mcp_server";
+  server_name: string;
+  description: string;
+  url: string;
+};
+
+export type ClientControlRemoveCustomMcpServer = {
+  type: "control_remove_custom_mcp_server";
+  server_name: string;
+};
+
 export type ClientControlMessage =
   | ClientControlAgentProfileCreate
   | ClientControlAgentProfileDelete
@@ -123,7 +136,9 @@ export type ClientControlMessage =
   | ClientControlTeamCreate
   | ClientControlSessionDelete
   | ClientControlAddTeamUser
-  | ClientControlRemoveTeamUser;
+  | ClientControlRemoveTeamUser
+  | ClientControlAddCustomMcpServer
+  | ClientControlRemoveCustomMcpServer;
 
 //
 // Messages for specific sessions
@@ -217,12 +232,6 @@ export type ClientSetAgentPaused = {
   paused: boolean;
 };
 
-export type ClientAddMcpServerFromUrl = {
-  type: "add_mcp_server_from_url";
-  server_name: string;
-  url: string;
-};
-
 export type ClientGetMcpResource = {
   type: "get_mcp_resource";
   client_message_id: string;
@@ -263,7 +272,6 @@ export type ClientSessionMessageData =
   | ClientSetSystemPrompt
   | ClientSetModel
   | ClientSetAgentPaused
-  | ClientAddMcpServerFromUrl
   | ClientGetMcpResource
   | ClientSetMcpServerConfig
   | ClientShareSession;
@@ -291,6 +299,8 @@ export function isClientControlMessage(
     case "control_team_create":
     case "control_add_team_user":
     case "control_remove_team_user":
+    case "control_add_custom_mcp_server":
+    case "control_remove_custom_mcp_server":
       return true;
     default: {
       const _: never = msg;
@@ -382,6 +392,7 @@ export type ServerAgentMessageChunk = {
   message_idx: number;
   alternative?: string;
   end: boolean;
+  alt?: string;
 } & ServerSessionMessage;
 
 export type ServerReasoningChunk = {
@@ -641,6 +652,7 @@ export type ServerControlSessionList = {
   user_sessions: Array<SessionDescriptor>;
   user_agents: Array<SavedAgentProfile>;
   team_sessions: Array<TeamInfo>;
+  custom_mcp_servers: Record<string, CustomMcpServerDescriptor>;
 } & ControlResponseMessage;
 
 /**
@@ -662,6 +674,17 @@ export type ServerControlSessionDeleted = {
   team_uuid?: string;
 } & ControlResponseMessage;
 
+export type ServerControlCustomMcpServerAdded = {
+  type: "control_custom_mcp_server_added";
+  server_name: string;
+  url: string;
+};
+
+export type ServerControlCustomMcpServerRemoved = {
+  type: "control_custom_mcp_server_removed";
+  server_name: string;
+};
+
 /**
  * Connection-level errors
  * Error in response to an invalid request from the client
@@ -681,6 +704,8 @@ export type ServerControlMessage =
   | ServerControlAgentProfileDeleted
   | ServerControlTeamCreated
   | ServerControlTeamMembersUpdated
+  | ServerControlCustomMcpServerAdded
+  | ServerControlCustomMcpServerRemoved
   | ServerControlError;
 
 export type ServerSessionScopedMessage =
@@ -713,6 +738,8 @@ export function isServerControlMessage(
     case "control_session_deleted":
     case "control_team_created":
     case "control_team_members_updated":
+    case "control_custom_mcp_server_added":
+    case "control_custom_mcp_server_removed":
     case "control_error":
       return true;
     default: {