@xalia/agent 0.6.2 → 0.6.3

package/src/chat/client/sessionClient.ts

@@ -18,18 +18,16 @@ import {
   ClientSessionMessage,
   ClientSessionMessageData,
   ServerSessionScopedMessage,
-  ServerSessionInfo,
   ClientSetWorkspace,
   ClientToServer,
   isServerSessionFileMessage,
 } from "../protocol/messages";
 import { SessionParticipantMap } from "../data/dataModels";
-import { createSessionParticipantMap } from "../data/database";
 import { ISessionMessageSender } from "./interfaces";
 import { IMessageSender } from "./connection";
 import { SessionFiles } from "./sessionFiles";
 import { SessionFileDescriptor } from "../data/dbSessionFileModels";
-import { ResponseHandler } from "./responseHandler";
+import { ResponseAwaiter } from "../utils/responseAwaiter";
 
 const logger = getLogger();
 
@@ -205,16 +203,18 @@ class RemoteSudoMcpServerManager implements ISkillManager {
   async shutdown(): Promise<void> {}
 }
 
+type ServerResponseMessages = Extract<
+  ServerSessionScopedMessage,
+  { client_message_id?: string }
+>;
+
 export class SessionClient implements ISessionMessageSender, IConversation {
   private readonly sessionUUID: string;
   private readonly savedAgentProfile: SavedAgentProfile;
   private readonly sender: IMessageSender<ClientToServer>;
   private readonly smsm: RemoteSudoMcpServerManager;
   private readonly sessionFiles: SessionFiles;
-  private readonly responseHandler: ResponseHandler<
-    ClientSessionMessage,
-    ServerSessionScopedMessage
-  >;
+  private readonly responseHandler: ResponseAwaiter<ServerResponseMessages>;
   private participants: SessionParticipantMap;
   private systemPrompt: string;
   private model: string;
@@ -234,7 +234,10 @@ export class SessionClient implements ISessionMessageSender, IConversation {
     this.sender = sender;
     this.smsm = new RemoteSudoMcpServerManager(this, serverBriefs);
     this.sessionFiles = new SessionFiles(sessionUUID, fileList, sender);
-    this.responseHandler = new ResponseHandler("session_error");
+    this.responseHandler = ResponseAwaiter.init(
+      "session_error",
+      (msg: ServerResponseMessages) => msg.client_message_id
+    );
     this.participants = participants;
     this.systemPrompt = "";
     this.model = "";
@@ -381,12 +384,6 @@ export class SessionClient implements ISessionMessageSender, IConversation {
     this.sender.send(enrichedMessage);
   }
 
-  public updateSessionInfo(sessionInfo: ServerSessionInfo): void {
-    // TODO: Determine the correct approach. Cache the workspace?
-    const infoStr = JSON.stringify(sessionInfo.workspace);
-    logger.debug(`[SessionClient] ignoring session info: ${infoStr}`);
-  }
-
   public setWorkspace(
     message: string | undefined,
     imageB64: string | undefined
@@ -428,7 +425,9 @@ export class SessionClient implements ISessionMessageSender, IConversation {
     };
 
     this.sender.send(msg);
-    const response = await this.responseHandler.waitForResponse(msg);
+    const response = await this.responseHandler.waitForResponse(
+      msg.client_message_id
+    );
     if (response.type === "session_shared") {
       return response.access_token;
     }
@@ -470,10 +469,7 @@ export class SessionClient implements ISessionMessageSender, IConversation {
         this.model = message.model;
         break;
       case "session_info":
-        // Update participants if we receive session_info again
-        if ("participants" in message) {
-          this.participants = createSessionParticipantMap(message.participants);
-        }
+        // This is handled in the layer above, in the chatClient
         break;
       case "user_added":
         this.participants.set(message.user_uuid, {

package/src/chat/client/sessionFiles.ts

@@ -8,16 +8,11 @@ import {
   ServerSessionFileContent,
   ServerSessionFileMessage,
 } from "../protocol/messages";
-import { ResponseHandler } from "./responseHandler";
 import { IMessageSender } from "./connection";
+import { ResponseAwaiter } from "../utils/responseAwaiter";
 
 const logger = getLogger();
 
-type ClientRequestContent = Extract<
-  ClientToServer,
-  { type: "session_file_get_content" }
->;
-
 /// Object for the UI to use to interact with the FileManager.  If the UI
 /// receives ServerSessionFileChanged or ServerSessionFileDeleted then it
 /// should call `listFiles()` to get the new list of files, and optionally
@@ -25,10 +20,7 @@ type ClientRequestContent = Extract<
 export class SessionFiles {
   readonly sessionUUID: string;
   readonly descriptors: Map<string, SessionFileDescriptor>;
-  readonly responseHandler: ResponseHandler<
-    ClientRequestContent,
-    ServerSessionFileContent
-  >;
+  readonly responseHandler: ResponseAwaiter<ServerSessionFileContent>;
   readonly sender: IMessageSender<ClientToServer>;
 
   constructor(
@@ -38,7 +30,10 @@ export class SessionFiles {
   ) {
     this.sessionUUID = sessionUUID;
     this.descriptors = new Map(initialFileList.map((d) => [d.name, d]));
-    this.responseHandler = new ResponseHandler(undefined);
+    this.responseHandler = ResponseAwaiter.init(
+      undefined,
+      (msg) => msg.client_message_id
+    );
     this.sender = sender;
   }
 
@@ -57,7 +52,9 @@ export class SessionFiles {
       client_message_id: uuidv4(),
     };
     this.sender.send(msg);
-    const response = await this.responseHandler.waitForResponse(msg);
+    const response = await this.responseHandler.waitForResponse(
+      msg.client_message_id
+    );
     if (response.name !== name) {
       throw new Error(
         `invalid name for file ${name}: ${JSON.stringify(response)}`

package/src/chat/data/dataModels.ts

@@ -52,6 +52,7 @@ export type SessionCreateData = {
   user_uuid: string;
 
   team_uuid?: string | undefined;
+  participants?: Array<TeamParticipant>;
   access_token?: string;
   agent_paused: boolean;
 };

package/src/chat/protocol/messages.ts

@@ -129,6 +129,7 @@ export type ClientControlMessage =
 
 export type ClientUserMessage = {
   type: "msg";
+  race_mode?: boolean;
 } & UserMessageData;
 
 export type ClientSetWorkspace = {
@@ -224,6 +225,12 @@ export type ClientShareSession = {
   type: "share_session";
 };
 
+export type ClientRaceModeResult = {
+  type: "race_mode_result";
+  message_id: string;
+  result: string;
+} & UserMessageData;
+
 export type ClientSessionMessageData =
   | ClientUserMessage
   | ClientSetWorkspace
@@ -341,6 +348,7 @@ export type ServerHistory = {
 export type ServerUserMessage = {
   type: "user_msg";
   user_uuid: string;
+  user_nickname: string;
   message_idx: number;
 } & UserMessageData &
   ServerSessionMessage;
@@ -355,6 +363,7 @@ export type ServerAgentMessageChunk = {
   type: "agent_msg_chunk";
   message: string;
   message_idx: number;
+  alternative?: string;
   end: boolean;
 } & ServerSessionMessage;
 
@@ -378,10 +387,6 @@ export type ServerUserLeft = {
   user_uuid: string;
 } & ServerSessionMessage;
 
-export type ServerSessionUpdate = {
-  type: "session_update";
-  title?: string;
-} & ServerSessionMessage;
 
 // Note: ChatCompletionMessageToolCall contains the tool call id so we don't
 // need an extra id field.
@@ -432,7 +437,6 @@ export type ServerUserTyping = {
 export type ServerToClientNotifications =
   | ServerUserJoined
   | ServerUserLeft
-  | ServerSessionUpdate
   | ServerToolAutoApprovalSet
   | ServerToolCall
   | ServerToolCallApprovalResult
@@ -471,12 +475,6 @@ export type ServerSessionFileMessage =
 //
 // state updates
 //
-
-/**
- * A new team has been created.
- * The members array contains the members of the team.
- * The members array contains undefined for failed lookups.
- */
 export type ServerMcpServerAdded = {
   type: "mcp_server_added";
   server_name: string;
@@ -731,7 +729,6 @@ export function isServerSessionScopedMessage(
     case "agent_reasoning_chunk":
     case "user_joined":
     case "user_left":
-    case "session_update":
     case "tool_auto_approval_set":
     case "tool_call":
     case "tool_call_approval_result":

package/src/chat/server/chatContextManager.ts

@@ -19,7 +19,6 @@ import {
   ClientUserMessage,
   ServerAgentMessage,
   ServerAgentMessageChunk,
-  ServerSessionError,
   ServerToolCallResult,
   ServerUserMessage,
 } from "../protocol/messages";
@@ -213,7 +212,8 @@ export class ChatContextManager
 
   processUserMessage(
     msg: ClientUserMessage,
-    from: string
+    from_uuid: string,
+    from_nickname: string
   ): ServerUserMessage | undefined {
     // TODO: maintain a queue internally instead of relying on the caller to
     // pass in our generated messages back into `startAgentResponse`.
@@ -229,7 +229,8 @@ export class ChatContextManager
       session_id: this.sessionUUID,
       message_idx,
       message: msg.message,
-      user_uuid: from,
+      user_uuid: from_uuid,
+      user_nickname: from_nickname,
     };
     if (msg.imageB64) {
       userMessage.imageB64 = msg.imageB64;
@@ -288,7 +289,7 @@ export class ChatContextManager
       const userMsg = createUserMessage(
         msg.message,
         msg.imageB64,
-        msg.user_uuid
+        msg.user_nickname
       );
       if (userMsg) {
         llmUserMessages.push(userMsg);
@@ -366,7 +367,7 @@ export class ChatContextManager
       if (JSON.stringify(sMsg.content) !== JSON.stringify(lMsg)) {
         messageListError(
           `newSessionMessages[${String(i)}].content !== ` +
-            `newLLMMessages[${String(i)}].content`
+            `newLLMMessages[${String(i)}]`
         );
       }
       if (sMsg.message_idx !== pMsg.message_idx) {
@@ -399,7 +400,7 @@ export class ChatContextManager
    * This function checks that nothing has been entered into the LLM context,
    * and drops any new user messages or responses before the error.
    */
-  revertAgentResponse(errMsg: string): ServerSessionError {
+  revertAgentResponse(errMsg: string): void {
     logger.warn(`[ChatContextManager.revertAgentResponse] error: ${errMsg}`);
 
     assert(typeof this.startingLLMContextLength !== "undefined");
@@ -425,12 +426,6 @@ export class ChatContextManager
     this.startingLLMContextLength = undefined;
     this.pendingMessages = undefined;
     this.curAgentMsgIdx = undefined;
-
-    return {
-      type: "session_error",
-      session_id: this.sessionUUID,
-      message: errMsg,
-    };
   }
 
   processAgentMessage(msg: string, end: boolean): ServerAgentMessageChunk {

package/src/chat/server/connectionManager.test.ts

@@ -117,6 +117,7 @@ describe("ConnectionManager", () => {
         d: {
           type: "user_msg",
           user_uuid: "user_1",
+          user_nickname: "User 1",
           session_id: "session_1",
           message: "message text",
           message_idx: 12,

package/src/chat/server/conversation.ts

@@ -104,19 +104,24 @@ export function sessionMessagesToLLMConversation(
  */
 export function userMessageToConversationMessage(
   userMessage: ChatCompletionUserMessageParam,
+  user_uuid: string,
   message_idx: number,
-  defaultUserUuid: string,
   session_id: string
 ): ServerUserMessage {
   // The name on the message should be the uuid
 
   const userMsgData = llmUserMessageToUserMessageData(userMessage);
-  const user_uuid = userMessage.name || defaultUserUuid;
+  const user_nickname = userMessage.name;
+  assert(
+    user_nickname,
+    `ChatCompletionUserMessageParam without user ${JSON.stringify(userMessage)}`
+  );
   const msg: ServerUserMessage = {
     type: "user_msg",
     message: userMsgData.message,
     message_idx,
     user_uuid,
+    user_nickname,
     session_id,
   };
   if (userMsgData.imageB64) {
@@ -183,14 +188,17 @@ export function sessionMessagesToConversationMessages(
         );
         break;
       case "user":
-        msgs.push(
-          userMessageToConversationMessage(
-            ccmp,
-            message_idx,
-            defaultUserUuid,
-            session_id
-          )
-        );
+        {
+          const user_uuid = sm.sender_uuid || defaultUserUuid;
+          msgs.push(
+            userMessageToConversationMessage(
+              ccmp,
+              user_uuid,
+              message_idx,
+              session_id
+            )
+          );
+        }
         break;
       case "tool":
         msgs.push(
@@ -267,7 +275,7 @@ export function chatUserMessageToSessionMessage(
   const userMsg = createUserMessage(
     chatMessage.message,
     chatMessage.imageB64,
-    chatMessage.user_uuid
+    chatMessage.user_nickname
   );
   assert(userMsg);
   return {