@meshagent/meshagent 0.46.4 → 0.47.1

package/dist/esm/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/esm/meshagent-client.js

@@ -654,6 +654,7 @@ export 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" ||
@@ -817,6 +818,25 @@ export class Meshagent {
         }
         return { jwt, roomName: roomNameValue, projectId: projectIdValue, roomUrl: roomUrlValue };
     }
+    parseAgentConnectionInfo(data) {
+        if (!data || typeof data !== "object") {
+            throw new 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 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);
     }
@@ -1842,6 +1862,14 @@ export 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/esm/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;

package/dist/esm/messaging-client.js

@@ -1,7 +1,7 @@
 import { Completer } from "./completer.js";
 import { EventEmitter } from "./event-emitter.js";
 import { RemoteParticipant } from "./participant.js";
-import { JsonContent } from "./response.js";
+import { ControlContent, JsonContent } from "./response.js";
 import { RoomMessage, RoomMessageEvent } from "./room-event.js";
 import { RoomServerException } from "./room-server-client.js";
 import { splitMessageHeader, splitMessagePayload } from "./utils.js";
@@ -19,6 +19,255 @@ function bytesToBase64(bytes) {
     }
     return globalScope.btoa(binary);
 }
+function base64ToBytes(value) {
+    if (globalScope.Buffer != null) {
+        return new Uint8Array(globalScope.Buffer.from(value, "base64"));
+    }
+    const atob = globalThis.atob;
+    if (atob == null) {
+        throw new Error("base64 decoding is not available in this runtime");
+    }
+    const binary = atob(value);
+    return Uint8Array.from(binary, (character) => character.charCodeAt(0));
+}
+class MessagingStreamInput {
+    constructor() {
+        this.items = [];
+        this.signal = null;
+        this.active = null;
+        this.closed = false;
+        this.error = null;
+    }
+    enqueue(content, { wait = false } = {}) {
+        if (this.closed) {
+            return Promise.reject(this.error ?? new RoomServerException("the messaging stream is closed"));
+        }
+        const sent = wait ? new Completer() : undefined;
+        this.items.push({ content, sent });
+        this.signal?.resolve();
+        this.signal = null;
+        return sent?.fut ?? Promise.resolve();
+    }
+    close(error = new RoomServerException("the messaging stream is closed")) {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+        this.error = error;
+        this.active?.sent?.reject(error);
+        this.active = null;
+        for (const item of this.items.splice(0)) {
+            item.sent?.reject(error);
+        }
+        this.signal?.resolve();
+        this.signal = null;
+    }
+    fail(error) {
+        this.close(error);
+    }
+    async *stream() {
+        try {
+            while (true) {
+                while (this.items.length === 0 && !this.closed) {
+                    this.signal ?? (this.signal = new Completer());
+                    await this.signal.fut;
+                }
+                const item = this.items.shift();
+                if (item == null) {
+                    return;
+                }
+                this.active = item;
+                yield item.content;
+                item.sent?.resolve();
+                this.active = null;
+            }
+        }
+        finally {
+            if (this.active != null && this.closed) {
+                this.active.sent?.reject(this.error ?? new RoomServerException("the messaging stream is closed"));
+                this.active = null;
+            }
+        }
+    }
+}
+export class MessagingStream {
+    constructor({ streamId, remoteParticipantId, input, output, inputClosed, onClosed, }) {
+        this.events = [];
+        this.eventSignal = null;
+        this.state = "accepted";
+        this.streamId = streamId;
+        this.remoteParticipantId = remoteParticipantId;
+        this.input = input;
+        this.output = output;
+        this.inputDone = Promise.resolve(inputClosed).catch((error) => {
+            this.input.fail(error);
+            this.push({
+                kind: "closed",
+                streamId: this.streamId,
+                reason: "error",
+                message: error instanceof Error ? error.message : String(error),
+            });
+            void this.output.return?.();
+            this.finish();
+        });
+        this.onClosed = onClosed;
+        void this.consumeOutput();
+    }
+    get closed() {
+        return this.state === "terminal";
+    }
+    push(event) {
+        if (this.state !== "accepted") {
+            return;
+        }
+        this.events.push(event);
+        this.eventSignal?.resolve();
+        this.eventSignal = null;
+    }
+    finish() {
+        if (this.state === "terminal") {
+            return;
+        }
+        this.state = "terminal";
+        this.input.close();
+        this.eventSignal?.resolve();
+        this.eventSignal = null;
+        void this.inputDone.finally(this.onClosed);
+    }
+    async consumeOutput() {
+        try {
+            while (true) {
+                const next = await this.output.next();
+                if (next.done) {
+                    return;
+                }
+                if (next.value instanceof ControlContent && next.value.method === "close") {
+                    this.push({
+                        kind: "client_disconnected",
+                        streamId: this.streamId,
+                        participantId: this.remoteParticipantId,
+                    });
+                    return;
+                }
+                if (!(next.value instanceof JsonContent)) {
+                    throw new RoomServerException("unexpected chunk from messaging.stream");
+                }
+                const value = next.value.json;
+                const kind = value["kind"];
+                if (kind === "message") {
+                    const type = value["type"];
+                    const message = value["message"];
+                    if (typeof type !== "string" || typeof message !== "object" || message == null || Array.isArray(message)) {
+                        throw new RoomServerException("invalid message chunk from messaging.stream");
+                    }
+                    const encodedAttachment = value["attachment_base64"];
+                    this.push({
+                        kind: "message",
+                        message: new RoomMessage({
+                            fromParticipantId: this.remoteParticipantId,
+                            type,
+                            message: message,
+                            attachment: typeof encodedAttachment === "string" && encodedAttachment !== ""
+                                ? base64ToBytes(encodedAttachment)
+                                : undefined,
+                        }),
+                    });
+                }
+                else if (kind === "client_disconnected" && typeof value["participant_id"] === "string") {
+                    this.push({
+                        kind,
+                        streamId: this.streamId,
+                        participantId: value["participant_id"],
+                    });
+                    return;
+                }
+                else if (kind === "closed") {
+                    this.push({
+                        kind,
+                        streamId: this.streamId,
+                        reason: typeof value["reason"] === "string" ? value["reason"] : "closed",
+                        message: typeof value["message"] === "string" ? value["message"] : undefined,
+                    });
+                    return;
+                }
+                else {
+                    throw new RoomServerException("unexpected chunk from messaging.stream");
+                }
+            }
+        }
+        catch (error) {
+            this.input.fail(error);
+            this.push({
+                kind: "closed",
+                streamId: this.streamId,
+                reason: "error",
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+        finally {
+            this.finish();
+        }
+    }
+    content({ type, message, attachment, }) {
+        return new JsonContent({
+            json: {
+                type,
+                message_json: JSON.stringify(message),
+                ...(attachment == null ? {} : { attachment_base64: bytesToBase64(attachment) }),
+            },
+        });
+    }
+    sendMessageNowait(params) {
+        if (this.state !== "accepted") {
+            throw new RoomServerException("the messaging stream is closed");
+        }
+        void this.input.enqueue(this.content(params));
+    }
+    async sendMessage(params) {
+        if (this.state !== "accepted") {
+            throw new RoomServerException("the messaging stream is closed");
+        }
+        await this.input.enqueue(this.content(params), { wait: true });
+    }
+    async close() {
+        if (this.state === "terminal") {
+            await this.inputDone;
+            return;
+        }
+        this.input.close();
+        try {
+            await this.inputDone;
+        }
+        finally {
+            await this.output.return?.();
+            this.finish();
+        }
+    }
+    clientDisconnected(participantId) {
+        if (this.state === "terminal") {
+            return;
+        }
+        this.push({
+            kind: "client_disconnected",
+            streamId: this.streamId,
+            participantId,
+        });
+        this.finish();
+    }
+    async *[Symbol.asyncIterator]() {
+        while (true) {
+            while (this.events.length === 0 && this.state !== "terminal") {
+                this.eventSignal ?? (this.eventSignal = new Completer());
+                await this.eventSignal.fut;
+            }
+            const event = this.events.shift();
+            if (event == null) {
+                return;
+            }
+            yield event;
+        }
+    }
+}
 export class MessagingClient extends EventEmitter {
     constructor({ room }) {
         super();
@@ -27,6 +276,8 @@ export class MessagingClient extends EventEmitter {
         this._messageQueue = [];
         this._messageQueued = null;
         this._sendTask = null;
+        this._sendOperations = new Set();
+        this._streams = new Set();
         this._messageQueueClosed = false;
         this._desiredEnabled = false;
         this._online = false;
@@ -56,11 +307,12 @@ export class MessagingClient extends EventEmitter {
         }
         return input;
     }
-    async _invoke({ operation, input, }) {
+    async _invoke({ operation, input, afterSend, }) {
         await this.client.invokeContent({
             toolkit: "messaging",
             tool: operation,
             input: new JsonContent({ json: input }),
+            afterSend,
         });
     }
     _invokeNowait({ operation, input, }) {
@@ -90,6 +342,8 @@ export class MessagingClient extends EventEmitter {
         if (sendTask != null) {
             await sendTask;
         }
+        await Promise.all(this._sendOperations);
+        await Promise.all([...this._streams].map(async (stream) => stream.close()));
         this._desiredEnabled = false;
         this._clearCurrentConnectionState();
     }
@@ -153,6 +407,9 @@ export class MessagingClient extends EventEmitter {
         }
     }
     _onRoomDisconnect({ reason: _reason }) {
+        for (const stream of [...this._streams]) {
+            stream.clientDisconnected(this.client.localParticipant?.id ?? stream.remoteParticipantId);
+        }
         this._clearCurrentConnectionState();
     }
     _onRoomReconnect() {
@@ -235,34 +492,52 @@ export class MessagingClient extends EventEmitter {
                 });
                 continue;
             }
-            try {
-                await this._invoke({
-                    operation: "send",
-                    input: this._messageInput({
-                        toParticipantId: resolvedTo.id,
-                        type: message.type,
-                        message: message.message,
-                        attachment: message.attachment,
-                    }),
-                });
-                if (message.completer != null && !message.completer.completed) {
-                    message.completer.complete();
-                }
+            const dispatched = new Completer();
+            const operation = this._sendQueuedMessage({
+                message,
+                resolvedTo,
+                afterSend: () => dispatched.resolve(),
+            });
+            this._sendOperations.add(operation);
+            void operation.then(() => {
+                this._sendOperations.delete(operation);
+                if (!dispatched.completed)
+                    dispatched.resolve();
+            }, () => {
+                this._sendOperations.delete(operation);
+                if (!dispatched.completed)
+                    dispatched.resolve();
+            });
+            await dispatched.fut;
+        }
+    }
+    async _sendQueuedMessage({ message, resolvedTo, afterSend, }) {
+        try {
+            await this._invoke({
+                operation: "send",
+                input: this._messageInput({
+                    toParticipantId: resolvedTo.id,
+                    type: message.type,
+                    message: message.message,
+                    attachment: message.attachment,
+                }),
+                afterSend,
+            });
+            if (message.completer != null && !message.completer.completed) {
+                message.completer.complete();
             }
-            catch (error) {
-                if (error instanceof RoomServerException) {
-                    const wrapped = this.client._coerceMessageSendError(error);
-                    if (wrapped.message === "the participant was not found") {
-                        this._markParticipantOffline(message.to);
-                        this._dropQueuedMessage({ message, error: wrapped });
-                        continue;
-                    }
-                    this._dropQueuedMessage({ message, error: wrapped });
-                    continue;
-                }
-                if (message.completer != null && !message.completer.completed) {
-                    message.completer.completeError(error);
+        }
+        catch (error) {
+            if (error instanceof RoomServerException) {
+                const wrapped = this.client._coerceMessageSendError(error);
+                if (wrapped.message === "the participant was not found") {
+                    this._markParticipantOffline(message.to);
                 }
+                this._dropQueuedMessage({ message, error: wrapped });
+                return;
+            }
+            if (message.completer != null && !message.completer.completed) {
+                message.completer.completeError(error);
             }
         }
     }
@@ -327,6 +602,49 @@ export class MessagingClient extends EventEmitter {
             throw error;
         }
     }
+    async stream({ to, type, message, attachment, }) {
+        const input = new MessagingStreamInput();
+        void input.enqueue(new JsonContent({
+            json: {
+                to_participant_id: to.id,
+                type,
+                message_json: JSON.stringify(message),
+                ...(attachment == null ? {} : { attachment_base64: bytesToBase64(attachment) }),
+            },
+        }));
+        const outputResult = await this.client.invokeToolCall({
+            toolkit: "messaging",
+            tool: "stream",
+            input: input.stream(),
+            streamInput: true,
+        });
+        if (outputResult.kind !== "stream") {
+            input.close();
+            throw new RoomServerException("unexpected return type from messaging.stream");
+        }
+        const outputIterable = outputResult.stream;
+        const output = outputIterable[Symbol.asyncIterator]();
+        const accepted = await output.next();
+        if (accepted.done
+            || !(accepted.value instanceof JsonContent)
+            || accepted.value.json["kind"] !== "accepted"
+            || typeof accepted.value.json["stream_id"] !== "string") {
+            input.close();
+            await output.return?.();
+            throw new RoomServerException("messaging.stream did not acknowledge acceptance");
+        }
+        let stream;
+        stream = new MessagingStream({
+            streamId: accepted.value.json["stream_id"],
+            remoteParticipantId: to.id,
+            input,
+            output,
+            inputClosed: outputResult.inputClosed,
+            onClosed: () => this._streams.delete(stream),
+        });
+        this._streams.add(stream);
+        return stream;
+    }
     getParticipants() {
         return this.remoteParticipants;
     }
@@ -420,6 +738,9 @@ export class MessagingClient extends EventEmitter {
         this._wakeMessageQueue();
         this._drainQueuedMessages({ error });
         this._desiredEnabled = false;
+        for (const stream of [...this._streams]) {
+            stream.clientDisconnected(this.client.localParticipant?.id ?? stream.remoteParticipantId);
+        }
         this._clearCurrentConnectionState();
         this.client.protocol.removeHandler("messaging.send", this._messageHandler);
         super.dispose();

package/dist/esm/participant-token.d.ts

@@ -404,6 +404,7 @@ export declare class ParticipantToken {
     addTunnelGrant(ports: number[]): void;
     addRoleGrant(role: string): void;
     addRoomGrant(roomName: string): void;
+    addSiteGrant(roomName: string): void;
     addApiGrant(grant: ApiScope): void;
     grantScope(name: string): string | ApiScope | undefined;
     getApiGrant(): ApiScope | undefined;

package/dist/esm/participant-token.js

@@ -1294,6 +1294,9 @@ export class ParticipantToken {
     addRoomGrant(roomName) {
         this.grants.push(new ParticipantGrant({ name: "room", scope: roomName }));
     }
+    addSiteGrant(roomName) {
+        this.grants.push(new ParticipantGrant({ name: "site", scope: roomName }));
+    }
     addApiGrant(grant) {
         for (const existingGrant of this.grants) {
             if (existingGrant.name === "api") {