@xalia/agent 0.6.8 → 0.6.10

package/src/chat/protocol/messages.ts

@@ -13,8 +13,9 @@ import {
   TeamParticipant,
   UserMessageData,
   SessionDescriptor,
+  CustomMcpServerDescriptor,
 } from "../data/dataModels";
-import { SessionFileDescriptor } from "../data/dbSessionFileModels";
+import { SessionFileDescriptor } from "../../agent/tools/fileManager";
 import {
   AssistantMessageParam,
   MessageParam,
@@ -114,6 +115,23 @@ 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 ClientControlRefinePrompt = {
+  type: "control_refine_prompt";
+  prompt: string;
+} & ClientToServerBase;
+
 export type ClientControlMessage =
   | ClientControlAgentProfileCreate
   | ClientControlAgentProfileDelete
@@ -123,7 +141,10 @@ export type ClientControlMessage =
   | ClientControlTeamCreate
   | ClientControlSessionDelete
   | ClientControlAddTeamUser
-  | ClientControlRemoveTeamUser;
+  | ClientControlRemoveTeamUser
+  | ClientControlAddCustomMcpServer
+  | ClientControlRemoveCustomMcpServer
+  | ClientControlRefinePrompt;
 
 //
 // Messages for specific sessions
@@ -131,9 +152,14 @@ export type ClientControlMessage =
 
 export type ClientUserMessage = {
   type: "msg";
-  race_mode?: boolean;
+  race_mode?: string;
 } & UserMessageData;
 
+/// Signal any currently running agent to stop
+export type ClientStop = {
+  type: "stop";
+};
+
 export type ClientSetWorkspace = {
   type: "set_workspace";
 } & UserMessageData;
@@ -217,12 +243,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;
@@ -248,6 +268,7 @@ export type ClientRaceModeResult = {
 
 export type ClientSessionMessageData =
   | ClientUserMessage
+  | ClientStop
   | ClientSetWorkspace
   | ClientAddMcpServer
   | ClientRemoveMcpServer
@@ -263,10 +284,10 @@ export type ClientSessionMessageData =
   | ClientSetSystemPrompt
   | ClientSetModel
   | ClientSetAgentPaused
-  | ClientAddMcpServerFromUrl
   | ClientGetMcpResource
   | ClientSetMcpServerConfig
-  | ClientShareSession;
+  | ClientShareSession
+  | ClientRaceModeResult;
 
 export type ClientSessionMessage = ClientSessionMessageBase &
   ClientSessionMessageData;
@@ -291,6 +312,9 @@ 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":
+    case "control_refine_prompt":
       return true;
     default: {
       const _: never = msg;
@@ -367,6 +391,7 @@ export type ServerUserMessage = {
   user_uuid: string;
   user_nickname: string;
   message_idx: number;
+  race_mode?: string;
 } & UserMessageData &
   ServerSessionMessage;
 
@@ -380,13 +405,14 @@ export type ServerAgentMessageChunk = {
   type: "agent_msg_chunk";
   message: string;
   message_idx: number;
-  alternative?: string;
   end: boolean;
+  alt?: string;
 } & ServerSessionMessage;
 
 export type ServerReasoningChunk = {
   type: "agent_reasoning_chunk";
   reasoning: string;
+  alt?: string;
 } & ServerSessionMessage;
 
 //
@@ -409,18 +435,21 @@ export type ServerUserLeft = {
 export type ServerToolCall = {
   type: "tool_call";
   tool_call: MessageToolCall;
+  alt?: string;
 } & ServerSessionMessage;
 
 export type ServerToolCallApprovalResult = {
   type: "tool_call_approval_result";
   id: string;
   result: boolean;
+  alt?: string;
 } & ServerSessionMessage;
 
 export type ServerToolCallResult = {
   type: "tool_call_result";
   message_idx: number;
   result: ToolMessageParam;
+  alt?: string;
 } & ServerSessionMessage;
 
 export type ServerToolAutoApprovalSet = {
@@ -557,6 +586,12 @@ export type ServerMcpResource = {
   contents: ResourceContent[];
 } & ServerSessionMessage;
 
+export type ServerContextUsage = {
+  type: "context_usage";
+  used_tokens: number;
+  max_tokens: number;
+} & ServerSessionMessage;
+
 export type ServerToClientStateUpdate =
   | ServerMcpServerAdded
   | ServerMcpServerRemoved
@@ -568,7 +603,8 @@ export type ServerToClientStateUpdate =
   | ServerUserAdded
   | ServerUserRemoved
   | ServerSessionShared
-  | ServerMcpResource;
+  | ServerMcpResource
+  | ServerContextUsage;
 
 //
 // actions
@@ -584,6 +620,7 @@ export type ServerApproveToolCall = {
   type: "approve_tool_call";
   id: string;
   tool_call: MessageToolCall;
+  alt?: string;
 } & ServerSessionMessage;
 
 export type ServerRenderHTML = {
@@ -591,10 +628,26 @@ export type ServerRenderHTML = {
   html: string;
 } & ServerSessionMessage;
 
+export type ServerEditorUpdate = {
+  type: "editor_update";
+  operation: "replace" | "append" | "prepend" | "replace_selection";
+  content: string;
+  format: "markdown";
+  selectionId?: string;
+} & ServerSessionMessage;
+
+export type ServerRaceModeGetResult = {
+  type: "race_mode_get_result";
+  message_id: string;
+  alts: string[];
+} & ServerSessionMessage;
+
 export type ServerToClientActions =
   | ServerAuthenticate
   | ServerApproveToolCall
-  | ServerRenderHTML;
+  | ServerRenderHTML
+  | ServerEditorUpdate
+  | ServerRaceModeGetResult;
 
 //
 // Control-level messages (session management)
@@ -641,6 +694,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 +716,23 @@ 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;
+};
+
+export type ServerControlRefinePromptResult = {
+  type: "control_refine_prompt_result";
+  refined_prompt: string;
+  client_message_id: string;
+};
+
 /**
  * Connection-level errors
  * Error in response to an invalid request from the client
@@ -681,6 +752,9 @@ export type ServerControlMessage =
   | ServerControlAgentProfileDeleted
   | ServerControlTeamCreated
   | ServerControlTeamMembersUpdated
+  | ServerControlCustomMcpServerAdded
+  | ServerControlCustomMcpServerRemoved
+  | ServerControlRefinePromptResult
   | ServerControlError;
 
 export type ServerSessionScopedMessage =
@@ -713,6 +787,9 @@ 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_refine_prompt_result":
     case "control_error":
       return true;
     default: {
@@ -776,8 +853,11 @@ export function isServerSessionScopedMessage(
     case "authenticate":
     case "approve_tool_call":
     case "render_html":
+    case "editor_update":
+    case "race_mode_get_result":
     case "session_shared":
     case "mcp_resource":
+    case "context_usage":
       return true;
 
     default: {