@meshagent/meshagent 0.46.4 → 0.47.1

package/dist/esm/room-client.d.ts

@@ -189,7 +189,8 @@ export declare class RoomClient {
     }): void;
     _sendLocalAttributesNowait(attributes: Record<string, unknown>): void;
     _resendLocalAttributesNowait(): void;
-    sendRequest(type: string, request: RequestHeader, data?: Uint8Array): Promise<Content>;
+    sendRequest(type: string, request: RequestHeader, data?: Uint8Array, afterSend?: () => void): Promise<Content>;
+    private _dispatchRequest;
     call(params: {
         name: string;
         url: string;
@@ -216,6 +217,7 @@ export declare class RoomClient {
         input?: InvokeInput;
         participantId?: string;
         onBehalfOfId?: string;
+        afterSend?: () => void;
     }): Promise<Content>;
     invokeToolCall(params: {
         toolkit: string;
@@ -224,6 +226,7 @@ export declare class RoomClient {
         streamInput?: boolean;
         participantId?: string;
         onBehalfOfId?: string;
+        afterSend?: () => void;
     }): Promise<{
         kind: "content";
         content: Content;
@@ -247,7 +250,7 @@ export declare class RoomClient {
         participantId?: string;
         onBehalfOfId?: string;
     }): Promise<AsyncIterable<Content>>;
-    private _sendToolCallRequestChunk;
+    private _dispatchToolCallRequestChunk;
     private _streamInvokeToolRequestChunks;
     private _decodeToolCallContent;
     private _handleToolCallResponseChunk;

package/dist/esm/room-client.js

@@ -1142,7 +1142,12 @@ export class RoomClient {
         }
         this._sendLocalAttributesNowait(attributes);
     }
-    async sendRequest(type, request, data) {
+    async sendRequest(type, request, data, afterSend) {
+        const response = this._dispatchRequest(type, request, data);
+        afterSend?.();
+        return await response;
+    }
+    _dispatchRequest(type, request, data) {
         this._raiseIfTerminal();
         if (this._entered && !this._connected && !this._allowDisconnectedRequests) {
             throw this._disconnectedError({ baseMessage: "room connection is disconnected" });
@@ -1151,8 +1156,8 @@ export class RoomClient {
         const completer = new Completer();
         this._pendingRequests.set(requestId, completer);
         try {
-            await this._protocolInstance.send(type, packMessage(request, data), requestId);
-            return await completer.fut;
+            this._protocolInstance.sendNowait(type, packMessage(request, data), { id: requestId });
+            return completer.fut;
         }
         catch (error) {
             this._pendingRequests.delete(requestId);
@@ -1235,6 +1240,7 @@ export class RoomClient {
             input: this._normalizeInvokeInput(params.input ?? params.arguments),
             participantId: params.participantId,
             onBehalfOfId: params.onBehalfOfId,
+            afterSend: params.afterSend,
         });
         if (output.kind !== "content") {
             throw new RoomServerException("unexpected streamed output from " + params.toolkit + "." + params.tool);
@@ -1257,7 +1263,6 @@ export class RoomClient {
         let requestTask;
         if (params.streamInput === true) {
             request["arguments"] = { type: "control", method: "open" };
-            requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
         }
         else {
             const input = params.input;
@@ -1274,9 +1279,14 @@ export class RoomClient {
         if (params.onBehalfOfId != null) {
             request["on_behalf_of_id"] = params.onBehalfOfId;
         }
+        const responseRequest = this._dispatchRequest("room.invoke_tool", request, requestData);
+        params.afterSend?.();
+        if (params.streamInput === true) {
+            requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
+        }
         try {
             const response = await Promise.race([
-                this.sendRequest("room.invoke_tool", request, requestData),
+                responseRequest,
                 preOpenError.fut,
             ]);
             this._toolCallPreOpenErrors.delete(toolCallId);
@@ -1331,9 +1341,10 @@ export class RoomClient {
         if (params.onBehalfOfId != null) {
             request["on_behalf_of_id"] = params.onBehalfOfId;
         }
+        const responseRequest = this._dispatchRequest("room.invoke_tool", request);
         const requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
         try {
-            const response = await this.sendRequest("room.invoke_tool", request);
+            const response = await responseRequest;
             await requestTask;
             if (response instanceof ControlContent && response.method === "open") {
                 throw new RoomServerException(`unexpected return type from ${params.toolkit}.${params.tool}`);
@@ -1364,6 +1375,7 @@ export class RoomClient {
         if (params.onBehalfOfId != null) {
             request["on_behalf_of_id"] = params.onBehalfOfId;
         }
+        const responseRequest = this._dispatchRequest("room.invoke_tool", request);
         const requestTask = this._streamInvokeToolRequestChunks(toolCallId, params.input);
         void requestTask.catch((error) => {
             const stream = this._toolCallStreams.get(toolCallId);
@@ -1377,7 +1389,7 @@ export class RoomClient {
         let response;
         try {
             response = await Promise.race([
-                this.sendRequest("room.invoke_tool", request),
+                responseRequest,
                 preOpenError.fut,
             ]);
         }
@@ -1399,24 +1411,27 @@ export class RoomClient {
             },
         };
     }
-    async _sendToolCallRequestChunk(toolCallId, chunk) {
+    _dispatchToolCallRequestChunk(toolCallId, chunk) {
+        this._raiseIfTerminal();
+        if (this._entered && !this._connected && !this._allowDisconnectedRequests) {
+            throw this._disconnectedError({ baseMessage: "room connection is disconnected" });
+        }
         const packed = chunk.pack();
         const request = {
             tool_call_id: toolCallId,
             chunk: JSON.parse(splitMessageHeader(packed)),
         };
         const payload = splitMessagePayload(packed);
-        await this.sendRequest("room.tool_call_request_chunk", request, payload.length > 0 ? payload : undefined);
+        this._protocolInstance.sendNowait("room.tool_call_request_chunk", packMessage(request, payload.length > 0 ? payload : undefined));
     }
     async _streamInvokeToolRequestChunks(toolCallId, input) {
-        await Promise.resolve();
         try {
             for await (const item of input) {
-                await this._sendToolCallRequestChunk(toolCallId, item);
+                this._dispatchToolCallRequestChunk(toolCallId, item);
             }
         }
         finally {
-            await this._sendToolCallRequestChunk(toolCallId, new ControlContent({ method: "close" }));
+            this._dispatchToolCallRequestChunk(toolCallId, new ControlContent({ method: "close" }));
         }
     }
     _decodeToolCallContent(params) {

package/dist/node/agent.js

@@ -530,10 +530,10 @@ class _RemoteToolkitWrapper {
             return false;
         }
     }
-    async _sendToolCallResponseChunk(messageId, toolCallId, chunk) {
+    _sendToolCallResponseChunk(messageId, toolCallId, chunk) {
         const [header, payload] = (0, utils_js_1.unpackMessage)(chunk.pack());
         try {
-            await this.client.protocol.send("room.tool_call_response_chunk", (0, utils_js_1.packMessage)({ tool_call_id: toolCallId, chunk: header }, payload.length > 0 ? payload : undefined), { id: messageId });
+            this.client.protocol.sendNowait("room.tool_call_response_chunk", (0, utils_js_1.packMessage)({ tool_call_id: toolCallId, chunk: header }, payload.length > 0 ? payload : undefined), { id: messageId });
             return true;
         }
         catch (error) {
@@ -634,10 +634,10 @@ class _RemoteToolkitWrapper {
                     return;
                 for await (const chunk of output.stream) {
                     this.toolkit.validateOutputContent(tool, chunk);
-                    if (!await this._sendToolCallResponseChunk(messageId, toolCallId, chunk))
+                    if (!this._sendToolCallResponseChunk(messageId, toolCallId, chunk))
                         return;
                 }
-                await this._sendToolCallResponseChunk(messageId, toolCallId, new response_js_1.ControlContent({ method: "close" }));
+                this._sendToolCallResponseChunk(messageId, toolCallId, new response_js_1.ControlContent({ method: "close" }));
                 return;
             }
             throw new Error(`tool ${toolName} returned unsupported output`);
@@ -648,9 +648,9 @@ class _RemoteToolkitWrapper {
                 return;
             }
             if (!(error instanceof InvalidToolDataException)) {
-                await this._sendToolCallResponseChunk(messageId, toolCallId, new response_js_1.ErrorContent({ text: String(error) }));
+                this._sendToolCallResponseChunk(messageId, toolCallId, new response_js_1.ErrorContent({ text: String(error) }));
             }
-            await this._sendToolCallResponseChunk(messageId, toolCallId, new response_js_1.ControlContent({
+            this._sendToolCallResponseChunk(messageId, toolCallId, new response_js_1.ControlContent({
                 method: "close",
                 statusCode: error instanceof InvalidToolDataException ? response_js_1.ControlCloseStatus.INVALID_DATA : undefined,
                 message: error instanceof InvalidToolDataException ? error.message : undefined,

package/dist/node/meshagent-client.d.ts

@@ -1,9 +1,10 @@
 import { ApiScope } from "./participant-token.js";
 export type ProjectRole = "member" | "admin" | "developer" | "room_creator" | "room_inventory" | "room_manager" | "session_inventory" | "agent_creator" | "agent_inventory" | "agent_manager" | "repository_creator" | "repository_inventory" | "repository_manager" | "feed_creator" | "feed_inventory" | "feed_manager" | "oauth_client_creator" | "oauth_client_inventory" | "oauth_client_manager" | "api_key_creator" | "api_key_inventory" | "api_key_manager" | "service_creator" | "service_inventory" | "service_manager" | "service_account_creator" | "service_account_inventory" | "service_account_manager" | "participant_token_creator" | "mailbox_creator" | "mailbox_inventory" | "mailbox_manager" | "route_creator" | "route_inventory" | "route_manager" | "scheduled_task_creator" | "scheduled_task_inventory" | "scheduled_task_manager" | "feed_subscription_creator" | "feed_subscription_inventory" | "feed_subscription_manager" | "llm_logger_creator" | "llm_logger_inventory" | "llm_logger_manager" | "llm_proxy_user" | "usage_reporter" | "billing_manager" | "group_manager";
 export type ResourceRole = "viewer" | "operator" | "developer" | "admin";
+export type RoomRole = "site_user" | ResourceRole;
 export type FeedRole = "reader" | "subscriber" | "publisher" | "manager";
 export type SecretRole = "use_proxy";
-export type AccessRole = ProjectRole | ResourceRole | FeedRole | SecretRole | "list";
+export type AccessRole = ProjectRole | RoomRole | FeedRole | SecretRole | "list";
 export type AccessSubjectType = "user" | "group" | "agent" | "service_account" | "userset";
 export type AccessResourceType = "project" | "room" | "agent" | "group" | "repository" | "feed" | "secret";
 export interface AccessSubject {
@@ -29,6 +30,12 @@ export interface RoomConnectionInfo {
     projectId: string;
     roomUrl: string;
 }
+export interface AgentConnectionInfo {
+    jwt: string;
+    agentName: string;
+    projectId: string;
+    agentUrl: string;
+}
 export declare class RoomSession {
     readonly id: string;
     readonly roomId?: string | null;
@@ -559,6 +566,7 @@ export declare class Meshagent {
     private parseTransaction;
     private parseOAuthClient;
     private parseRoomConnectionInfo;
+    private parseAgentConnectionInfo;
     private encodePathComponent;
     upload({ projectId, path, data }: {
         projectId: string;
@@ -908,6 +916,7 @@ export declare class Meshagent {
         subjectId: string;
     }): Promise<void>;
     connectRoom(projectId: string, room: string): Promise<RoomConnectionInfo>;
+    connectAgent(projectId: string, agentName: string): Promise<AgentConnectionInfo>;
     listRooms(projectId: string, options?: {
         pageSize?: number;
         continuationToken?: string;

package/dist/node/meshagent-client.js

@@ -659,6 +659,7 @@ class Meshagent {
         const parsedSubject = this.parseAccessSubject(data.subject);
         const parsedDirectRoles = Array.isArray(data.direct_roles)
             ? data.direct_roles.filter((item) => item === "member" ||
+                item === "site_user" ||
                 item === "viewer" ||
                 item === "operator" ||
                 item === "developer" ||
@@ -822,6 +823,25 @@ class Meshagent {
         }
         return { jwt, roomName: roomNameValue, projectId: projectIdValue, roomUrl: roomUrlValue };
     }
+    parseAgentConnectionInfo(data) {
+        if (!data || typeof data !== "object") {
+            throw new requirement_js_1.RoomException("Invalid agent connection payload");
+        }
+        const { jwt, agent_name: agentNameRaw, agentName, project_id: projectIdRaw, projectId, agent_url: agentUrlRaw, agentUrl } = data;
+        const agentNameValue = typeof agentName === "string" ? agentName : agentNameRaw;
+        const projectIdValue = typeof projectId === "string" ? projectId : projectIdRaw;
+        const agentUrlValue = typeof agentUrl === "string" ? agentUrl : agentUrlRaw;
+        if (typeof jwt !== "string" || typeof agentNameValue !== "string" || typeof projectIdValue !== "string" || typeof agentUrlValue !== "string") {
+            throw new requirement_js_1.RoomException("Invalid agent connection payload: missing fields");
+        }
+        const parsedUrl = new URL(agentUrlValue);
+        const legacySuffix = `/accounts/projects/${encodeURIComponent(projectIdValue)}/agents/${encodeURIComponent(agentNameValue)}/messages`;
+        if (parsedUrl.pathname.endsWith(legacySuffix)) {
+            const prefix = parsedUrl.pathname.slice(0, -legacySuffix.length);
+            parsedUrl.pathname = `${prefix}/agents/${encodeURIComponent(projectIdValue)}/${encodeURIComponent(agentNameValue)}/messages`;
+        }
+        return { jwt, agentName: agentNameValue, projectId: projectIdValue, agentUrl: parsedUrl.toString() };
+    }
     encodePathComponent(value) {
         return encodeURIComponent(value);
     }
@@ -1847,6 +1867,14 @@ class Meshagent {
         });
         return this.parseRoomConnectionInfo(data);
     }
+    async connectAgent(projectId, agentName) {
+        const data = await this.request(`/accounts/projects/${projectId}/agents/${encodeURIComponent(agentName)}/connect`, {
+            method: "POST",
+            json: {},
+            action: "connect agent",
+        });
+        return this.parseAgentConnectionInfo(data);
+    }
     async listRooms(projectId, options = {}) {
         const { pageSize = 50, continuationToken, filter, view } = options;
         const data = await this.request(`/accounts/projects/${projectId}/rooms`, {

package/dist/node/messaging-client.d.ts

@@ -1,8 +1,72 @@
 import { EventEmitter } from "./event-emitter.js";
 import { Participant, RemoteParticipant } from "./participant.js";
+import { Content } from "./response.js";
 import { RoomClient } from "./room-client.js";
-import { RoomMessageEvent } from "./room-event.js";
+import { RoomMessage, RoomMessageEvent } from "./room-event.js";
 type MessagePayload = Record<string, unknown>;
+export type MessagingStreamEvent = {
+    kind: "message";
+    message: RoomMessage;
+} | {
+    kind: "client_disconnected";
+    streamId: string;
+    participantId: string;
+} | {
+    kind: "closed";
+    streamId: string;
+    reason: string;
+    message?: string;
+};
+declare class MessagingStreamInput {
+    private readonly items;
+    private signal;
+    private active;
+    private closed;
+    private error;
+    enqueue(content: Content, { wait }?: {
+        wait?: boolean;
+    }): Promise<void>;
+    close(error?: unknown): void;
+    fail(error: unknown): void;
+    stream(): AsyncIterable<Content>;
+}
+export declare class MessagingStream implements AsyncIterable<MessagingStreamEvent> {
+    readonly streamId: string;
+    readonly remoteParticipantId: string;
+    private readonly input;
+    private readonly output;
+    private readonly inputDone;
+    private readonly onClosed;
+    private readonly events;
+    private eventSignal;
+    private state;
+    constructor({ streamId, remoteParticipantId, input, output, inputClosed, onClosed, }: {
+        streamId: string;
+        remoteParticipantId: string;
+        input: MessagingStreamInput;
+        output: AsyncIterator<Content>;
+        inputClosed?: Promise<void>;
+        onClosed: () => void;
+    });
+    get closed(): boolean;
+    private push;
+    private finish;
+    private consumeOutput;
+    private content;
+    sendMessageNowait(params: {
+        type: string;
+        message: MessagePayload;
+        attachment?: Uint8Array;
+    }): void;
+    sendMessage(params: {
+        type: string;
+        message: MessagePayload;
+        attachment?: Uint8Array;
+    }): Promise<void>;
+    close(): Promise<void>;
+    clientDisconnected(participantId: string): void;
+    [Symbol.asyncIterator](): AsyncIterator<MessagingStreamEvent>;
+}
 export declare class MessagingClient extends EventEmitter<RoomMessageEvent> {
     private readonly client;
     private readonly _messageHandler;
@@ -10,6 +74,8 @@ export declare class MessagingClient extends EventEmitter<RoomMessageEvent> {
     private readonly _messageQueue;
     private _messageQueued;
     private _sendTask;
+    private readonly _sendOperations;
+    private readonly _streams;
     private _messageQueueClosed;
     private _desiredEnabled;
     private _online;
@@ -42,6 +108,7 @@ export declare class MessagingClient extends EventEmitter<RoomMessageEvent> {
     private _dropQueuedMessage;
     private _drainQueuedMessages;
     private _sendMessages;
+    private _sendQueuedMessage;
     sendMessage({ to, type, message, attachment, ignoreOffline, }: {
         to: Participant;
         type: string;
@@ -62,6 +129,12 @@ export declare class MessagingClient extends EventEmitter<RoomMessageEvent> {
         message: MessagePayload;
         attachment?: Uint8Array;
     }): Promise<void>;
+    stream({ to, type, message, attachment, }: {
+        to: Participant;
+        type: string;
+        message: MessagePayload;
+        attachment?: Uint8Array;
+    }): Promise<MessagingStream>;
     getParticipants(): RemoteParticipant[];
     getParticipant(id: string): RemoteParticipant | null;
     getParticipantByName(name: string): RemoteParticipant | null;