@xalia/agent 0.6.1 → 0.6.3

package/src/chat/protocol/messages.ts

@@ -1,9 +1,3 @@
-import {
-  ChatCompletionMessageParam,
-  ChatCompletionAssistantMessageParam,
-  ChatCompletionToolMessageParam,
-  ChatCompletionMessageToolCall,
-} from "openai/resources.mjs";
 import { Tool } from "@modelcontextprotocol/sdk/types.js";
 
 import {
@@ -12,21 +6,29 @@ import {
   McpServerConfiguration,
   SavedAgentProfile,
 } from "@xalia/xmcp/sdk";
+
 import {
   TeamRole,
-  SessionData,
   TeamInfo,
   TeamParticipant,
   UserMessageData,
+  SessionDescriptor,
 } from "../data/dataModels";
+import { SessionFileDescriptor } from "../data/dbSessionFileModels";
+import {
+  ChatCompletionAssistantMessageParam,
+  ChatCompletionMessageParam,
+  ChatCompletionMessageToolCall,
+  ChatCompletionToolMessageParam,
+} from "../../agent/llm";
 
-interface ClientToServerBase {
+export interface ClientToServerBase {
   type: string;
   client_message_id: string; // TODO: hide by putting on ClientToServer?
 }
 
 // Session-level messages all have a `session_id`
-interface ClientSessionMessageBase extends ClientToServerBase {
+export interface ClientSessionMessageBase extends ClientToServerBase {
   session_id: string;
 }
 
@@ -127,6 +129,7 @@ export type ClientControlMessage =
 
 export type ClientUserMessage = {
   type: "msg";
+  race_mode?: boolean;
 } & UserMessageData;
 
 export type ClientSetWorkspace = {
@@ -173,6 +176,23 @@ export type ClientToolCallApprovalResult = {
   auto_approve: boolean;
 };
 
+export type ClientSessionFileGetContent = {
+  type: "session_file_get_content";
+  name: string;
+};
+
+export type ClientSessionFileDelete = {
+  type: "session_file_delete";
+  name: string;
+};
+
+export type ClientSessionFilePutContent = {
+  type: "session_file_put_content";
+  name?: string;
+  summary?: string;
+  data_url: string;
+};
+
 export type ClientSetAutoApproval = {
   type: "set_auto_approval";
   server_name: string;
@@ -190,12 +210,27 @@ export type ClientSetModel = {
   model: string;
 };
 
+export type ClientSetAgentPaused = {
+  type: "set_agent_paused";
+  paused: boolean;
+};
+
 export type ClientSetMcpServerConfig = {
   type: "set_mcp_server_config";
   server_name: string;
   config?: McpServerConfiguration;
 };
 
+export type ClientShareSession = {
+  type: "share_session";
+};
+
+export type ClientRaceModeResult = {
+  type: "race_mode_result";
+  message_id: string;
+  result: string;
+} & UserMessageData;
+
 export type ClientSessionMessageData =
   | ClientUserMessage
   | ClientSetWorkspace
@@ -206,10 +241,15 @@ export type ClientSessionMessageData =
   | ClientEnableAllMcpServerTools
   | ClientDisableAllMcpServerTools
   | ClientToolCallApprovalResult
+  | ClientSessionFileGetContent
+  | ClientSessionFileDelete
+  | ClientSessionFilePutContent
   | ClientSetAutoApproval
   | ClientSetSystemPrompt
   | ClientSetModel
-  | ClientSetMcpServerConfig;
+  | ClientSetAgentPaused
+  | ClientSetMcpServerConfig
+  | ClientShareSession;
 
 export type ClientSessionMessage = ClientSessionMessageBase &
   ClientSessionMessageData;
@@ -288,6 +328,7 @@ export type ServerSessionInfo = {
   agent_preferences: AgentPreferences;
   client_message_id: string;
   team_uuid: string | undefined;
+  agent_paused: boolean;
 } & ServerSessionMessage;
 
 /**
@@ -307,6 +348,7 @@ export type ServerHistory = {
 export type ServerUserMessage = {
   type: "user_msg";
   user_uuid: string;
+  user_nickname: string;
   message_idx: number;
 } & UserMessageData &
   ServerSessionMessage;
@@ -321,9 +363,15 @@ export type ServerAgentMessageChunk = {
   type: "agent_msg_chunk";
   message: string;
   message_idx: number;
+  alternative?: string;
   end: boolean;
 } & ServerSessionMessage;
 
+export type ServerReasoningChunk = {
+  type: "agent_reasoning_chunk";
+  reasoning: string;
+} & ServerSessionMessage;
+
 //
 // Notifications
 ///
@@ -339,11 +387,6 @@ export type ServerUserLeft = {
   user_uuid: string;
 } & ServerSessionMessage;
 
-export type ServerSessionUpdate = {
-  type: "session_update";
-  title?: string;
-  participants?: TeamParticipant[];
-} & ServerSessionMessage;
 
 // Note: ChatCompletionMessageToolCall contains the tool call id so we don't
 // need an extra id field.
@@ -394,7 +437,6 @@ export type ServerUserTyping = {
 export type ServerToClientNotifications =
   | ServerUserJoined
   | ServerUserLeft
-  | ServerSessionUpdate
   | ServerToolAutoApprovalSet
   | ServerToolCall
   | ServerToolCallApprovalResult
@@ -404,14 +446,35 @@ export type ServerToClientNotifications =
   | ServerUserTyping;
 
 //
-// state updates
+// session-file related messages
 //
 
-/**
- * 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 ServerSessionFileChanged = {
+  type: "session_file_changed";
+  descriptor: SessionFileDescriptor;
+  new_file: boolean;
+} & ServerSessionMessage;
+
+export type ServerSessionFileDeleted = {
+  type: "session_file_deleted";
+  name: string;
+} & ServerSessionMessage;
+
+export type ServerSessionFileContent = {
+  type: "session_file_content";
+  name: string;
+  data_url: string;
+  client_message_id: string;
+} & ServerSessionMessage;
+
+export type ServerSessionFileMessage =
+  | ServerSessionFileChanged
+  | ServerSessionFileDeleted
+  | ServerSessionFileContent;
+
+//
+// state updates
+//
 export type ServerMcpServerAdded = {
   type: "mcp_server_added";
   server_name: string;
@@ -446,6 +509,11 @@ export type ServerModelUpdated = {
   model: string;
 } & ServerSessionMessage;
 
+export type ServerAgentPaused = {
+  type: "agent_paused";
+  paused: boolean;
+} & ServerSessionMessage;
+
 export type ServerUserAdded = {
   type: "user_added";
   user_uuid: string;
@@ -459,6 +527,12 @@ export type ServerUserRemoved = {
   user_uuid: string;
 } & ServerSessionMessage;
 
+export type ServerSessionShared = {
+  type: "session_shared";
+  access_token: string;
+  client_message_id: string;
+} & ServerSessionMessage;
+
 export type ServerToClientStateUpdate =
   | ServerMcpServerAdded
   | ServerMcpServerRemoved
@@ -466,8 +540,10 @@ export type ServerToClientStateUpdate =
   | ServerMcpServerToolDisabled
   | ServerSystemPromptUpdated
   | ServerModelUpdated
+  | ServerAgentPaused
   | ServerUserAdded
-  | ServerUserRemoved;
+  | ServerUserRemoved
+  | ServerSessionShared;
 
 //
 // actions
@@ -523,12 +599,21 @@ export type ServerControlTeamCreated = {
   failed_lookups: Array<string>;
 };
 
+/**
+ * Team members have been updated (added or removed).
+ */
+export type ServerControlTeamMembersUpdated = {
+  type: "control_team_members_updated";
+  team_uuid: string;
+  members: Array<TeamParticipant>;
+};
+
 /**
  * List of available sessions for user
  */
 export type ServerControlSessionList = {
   type: "control_session_list";
-  user_sessions: Array<SessionData>;
+  user_sessions: Array<SessionDescriptor>;
   user_agents: Array<SavedAgentProfile>;
   team_sessions: Array<TeamInfo>;
 } & ControlResponseMessage;
@@ -570,6 +655,7 @@ export type ServerControlMessage =
   | ServerControlAgentProfileCreated
   | ServerControlAgentProfileDeleted
   | ServerControlTeamCreated
+  | ServerControlTeamMembersUpdated
   | ServerControlError;
 
 export type ServerSessionScopedMessage =
@@ -578,7 +664,9 @@ export type ServerSessionScopedMessage =
   | ServerUserMessage
   | ServerAgentMessage
   | ServerAgentMessageChunk
+  | ServerReasoningChunk
   | ServerToClientNotifications
+  | ServerSessionFileMessage
   | ServerToClientStateUpdate
   | ServerToClientActions;
 
@@ -599,6 +687,7 @@ export function isServerControlMessage(
     case "control_session_left":
     case "control_session_deleted":
     case "control_team_created":
+    case "control_team_members_updated":
     case "control_error":
       return true;
     default: {
@@ -608,6 +697,22 @@ export function isServerControlMessage(
   }
 }
 
+export function isServerSessionFileMessage(
+  message: ServerToClient
+): message is ServerSessionFileMessage {
+  const msg = message as ServerSessionFileMessage;
+  switch (msg.type) {
+    case "session_file_changed":
+    case "session_file_deleted":
+    case "session_file_content":
+      return true;
+    default: {
+      const _: never = msg;
+      return false;
+    }
+  }
+}
+
 /**
  * Type guard to check if a ServerToClient message is a session-scoped message
  */
@@ -621,9 +726,9 @@ export function isServerSessionScopedMessage(
     case "user_msg":
     case "agent_msg":
     case "agent_msg_chunk":
+    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":
@@ -631,18 +736,24 @@ export function isServerSessionScopedMessage(
     case "authentication_started":
     case "authentication_finished":
     case "user_typing":
+    case "session_file_changed":
+    case "session_file_deleted":
+    case "session_file_content":
     case "mcp_server_added":
     case "mcp_server_removed":
     case "mcp_server_tool_enabled":
     case "mcp_server_tool_disabled":
     case "system_prompt_updated":
     case "model_updated":
+    case "agent_paused":
     case "user_added":
     case "user_removed":
     case "authenticate":
     case "approve_tool_call":
     case "render_html":
+    case "session_shared":
       return true;
+
     default: {
       const _: never = msg;
       return false;

package/src/chat/server/chatContextManager.ts

@@ -2,13 +2,13 @@ import { strict as assert } from "assert";
 
 import { getLogger } from "@xalia/xmcp/sdk";
 
+import { createUserMessage } from "../../agent/agent";
 import {
   ChatCompletionAssistantMessageParam,
   ChatCompletionMessageParam,
   ChatCompletionToolMessageParam,
   ChatCompletionUserMessageParam,
-  createUserMessage,
-} from "../../agent/agent";
+} from "../../agent/llm";
 import { IContextManager } from "../../agent/context";
 import {
   CompressingContextManager,
@@ -19,7 +19,6 @@ import {
   ClientUserMessage,
   ServerAgentMessage,
   ServerAgentMessageChunk,
-  ServerSessionError,
   ServerToolCallResult,
   ServerUserMessage,
 } from "../protocol/messages";
@@ -28,16 +27,18 @@ import {
   MESSAGE_INDEX_FULL_INCREMENT,
   MESSAGE_INDEX_SUB_INCREMENT,
   chatMessagesToSessionMessages,
-  sessionMessagesToChatMessages,
+  sessionMessagesToConversationMessages,
   sessionMessagesToNextIndex,
 } from "./conversation";
 import {
   ISessionFileManager,
   ISessionFileManagerEventHandler,
-  SessionFileDescriptor,
-  SessionFileEntry,
   listFilesForLLM,
 } from "./sessionFileManager";
+import {
+  SessionFileDescriptor,
+  SessionFileEntry,
+} from "../data/dbSessionFileModels";
 
 const logger = getLogger();
 
@@ -115,7 +116,7 @@ export class ChatContextManager
     // Insert a system message placeholder into the context
 
     this.sessionUUID = sessionUUID;
-    this.conversationMessages = sessionMessagesToChatMessages(
+    this.conversationMessages = sessionMessagesToConversationMessages(
       sessionMessages,
       defaultUserName,
       sessionUUID
@@ -135,7 +136,7 @@ export class ChatContextManager
     this.pendingCompression = false;
     this.checkpointWriter = checkpointWriter;
     this.fileManager = fileManager;
-    fileManager.setEventHandler(this);
+    fileManager.addEventHandler(this);
     this.fileManagerDescriptionsDirty = true;
   }
 
@@ -188,7 +189,11 @@ export class ChatContextManager
   }
 
   // ISessionFileManagerEventHandler.onFileChange
-  onFileChange(_entry: SessionFileEntry): void {
+  onFileChanged(_entry: SessionFileEntry): void {
+    this.fileManagerDescriptionsDirty = true;
+  }
+
+  onFileDeleted(_name: string): void {
     this.fileManagerDescriptionsDirty = true;
   }
 
@@ -205,17 +210,27 @@ export class ChatContextManager
     return this.conversationMessages.concat(this.pendingUserMessages);
   }
 
-  processUserMessage(msg: ClientUserMessage, from: string): ServerUserMessage {
+  processUserMessage(
+    msg: ClientUserMessage,
+    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`.
 
+    // Filter out null messages immediately.
+    if (!msg.imageB64 && !msg.message) {
+      return undefined;
+    }
+
     const message_idx = this.getNextMessageIdx();
     const userMessage: ServerUserMessage = {
       type: "user_msg",
       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;
@@ -274,7 +289,7 @@ export class ChatContextManager
       const userMsg = createUserMessage(
         msg.message,
         msg.imageB64,
-        msg.user_uuid
+        msg.user_nickname
       );
       if (userMsg) {
         llmUserMessages.push(userMsg);
@@ -294,12 +309,21 @@ export class ChatContextManager
   }
 
   endAgentResponse(): SessionMessage[] {
-    assert(typeof this.startingLLMContextLength !== "undefined");
-    assert(typeof this.pendingMessages !== "undefined");
-    assert(typeof this.curAgentMsgIdx !== "undefined");
+    assert(
+      typeof this.startingLLMContextLength !== "undefined",
+      "agent response not started (startingLLMContextLength)"
+    );
+    assert(
+      typeof this.pendingMessages !== "undefined",
+      "agent response not started (pendingMessages)"
+    );
+    assert(
+      typeof this.curAgentMsgIdx !== "undefined",
+      "agent response not started (curAgentMsgIdx)"
+    );
 
     const numPending = this.pendingMessages.length;
-    assert(numPending > 1); // 1 user + 1 agent message
+    assert(numPending > 0, "no pending"); // at least 1 user message
 
     // Compute DB messages
 
@@ -343,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) {
@@ -376,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");
@@ -402,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

@@ -43,7 +43,6 @@ describe("ConnectionManager", () => {
     // we need to use type assertion
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     connectionManager = new (ConnectionManager as any)(
-      mockApiKeyManager.mock,
       mockSessionRegistry.mock
     );
   });
@@ -63,7 +62,7 @@ describe("ConnectionManager", () => {
       // Wait for deferred send
       await new Promise((resolve) => setImmediate(resolve));
 
-      expect(mockApiKeyManager.spies.verifyApiKey).toHaveBeenCalledWith(
+      expect(mockSessionRegistry.spies.authenticate).toHaveBeenCalledWith(
         "valid-api-key"
       );
       expect(mockWebSocket.spies.send).toHaveBeenCalledWith(
@@ -118,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,
@@ -136,18 +136,6 @@ describe("ConnectionManager", () => {
         JSON.stringify(testMessage)
       );
     });
-
-    it("should return API key for connected user", () => {
-      const apiKey = connectionManager.getLiveUserApiKey(MOCK_USERS.owner.uuid);
-      expect(apiKey).toBe("valid-api-key");
-    });
-
-    it("should return undefined for non-existent user", () => {
-      const apiKey = connectionManager.getLiveUserApiKey(
-        MOCK_USERS.nonExistent.uuid
-      );
-      expect(apiKey).toBeUndefined();
-    });
   });
 
   describe("connection cleanup", () => {
@@ -169,10 +157,6 @@ describe("ConnectionManager", () => {
         const closeHandler = closeHandlerCall[1];
         closeHandler();
       }
-
-      // After cleanup, API key should no longer be available
-      const apiKey = connectionManager.getLiveUserApiKey(MOCK_USERS.owner.uuid);
-      expect(apiKey).toBeUndefined();
     });
 
     it("should clean up connection state on error", () => {
@@ -186,10 +170,6 @@ describe("ConnectionManager", () => {
         const errorHandler = errorHandlerCall[1];
         errorHandler(new Error("WebSocket error"));
       }
-
-      // After cleanup, API key should no longer be available
-      const apiKey = connectionManager.getLiveUserApiKey(MOCK_USERS.owner.uuid);
-      expect(apiKey).toBeUndefined();
     });
   });