@beeos-ai/device-agent 0.12.4 → 0.12.5

package/dist/messaging/message-client.js

@@ -1,7 +1,134 @@
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 import { createMessageClient, } from "@beeos-ai/message-sdk";
-import { createNodeMessageClientComposition } from "@beeos-ai/message-sdk/node";
+import { createNodeMessageClientComposition, } from "@beeos-ai/message-sdk/node";
+/**
+ * SDK-compatible stream with an explicit write barrier. The public SDK stream
+ * intentionally keeps its mutation queue private; device actions need a
+ * stronger guarantee so their action card is persisted before execution.
+ */
+export class DrainableMessageReplyStream {
+    writer;
+    command;
+    messageId;
+    receipt;
+    body = "";
+    streamParts = [];
+    terminated = false;
+    sequence = 0;
+    chain;
+    openPromise;
+    constructor(writer, command) {
+        this.writer = writer;
+        this.command = command;
+        this.messageId = command.clientMessageId;
+        this.openPromise = writer.startStream(command).then((receipt) => {
+            if (receipt.messageId !== command.clientMessageId) {
+                throw new Error("message service must preserve the client-owned stream message id");
+            }
+            this.messageId = receipt.messageId;
+            this.receipt = receipt;
+            return receipt;
+        });
+        this.chain = this.openPromise.then(() => undefined, () => undefined);
+    }
+    get id() {
+        return this.messageId;
+    }
+    get isTerminated() {
+        return this.terminated;
+    }
+    get parts() {
+        return this.streamParts;
+    }
+    opened() {
+        return this.openPromise;
+    }
+    async flush() {
+        await this.openPromise;
+        await this.chain;
+    }
+    appendBody(chunk) {
+        this.assertActive();
+        if (!chunk)
+            return;
+        const bodyFrom = new TextEncoder().encode(this.body).byteLength;
+        this.body += chunk;
+        const key = this.nextKey("append");
+        this.enqueue(() => this.writer.append(this.command.conversationId, this.messageId, chunk, bodyFrom, key));
+    }
+    addPart(part) {
+        this.assertActive();
+        this.streamParts = [...this.streamParts, part];
+        this.flushParts();
+    }
+    replacePart(index, part) {
+        this.assertActive();
+        if (!Number.isInteger(index) || index < 0 || index >= this.streamParts.length) {
+            throw new Error("message stream part index is out of range");
+        }
+        const parts = [...this.streamParts];
+        parts[index] = part;
+        this.streamParts = parts;
+        this.flushParts();
+    }
+    finalize(options) {
+        return this.terminate("completed", options?.stopReason);
+    }
+    fail(options) {
+        if (options?.body !== undefined)
+            this.setBody(options.body);
+        return this.terminate("failed", options?.stopReason ?? "error");
+    }
+    refuse(options) {
+        return this.terminate("refused", options?.stopReason ?? "refused");
+    }
+    cancel(options) {
+        return this.terminate("cancelled", options?.stopReason ?? "user_stop");
+    }
+    setBody(body) {
+        this.assertActive();
+        if (body === this.body)
+            return;
+        if (!this.writer.setBody) {
+            throw new Error("message stream writer does not support body snapshots");
+        }
+        this.body = body;
+        const key = this.nextKey("body");
+        this.enqueue(() => this.writer.setBody(this.command.conversationId, this.messageId, body, key));
+    }
+    flushParts() {
+        if (!this.writer.setParts) {
+            throw new Error("message stream writer does not support parts");
+        }
+        const parts = [...this.streamParts];
+        const key = this.nextKey("parts");
+        this.enqueue(() => this.writer.setParts(this.command.conversationId, this.messageId, parts, key));
+    }
+    enqueue(write) {
+        this.chain = this.chain.then(async () => {
+            await this.openPromise;
+            await write();
+        });
+        void this.chain.catch(() => undefined);
+    }
+    async terminate(state, stopReason) {
+        this.assertActive();
+        this.terminated = true;
+        const receipt = await this.openPromise;
+        await this.chain;
+        await this.writer.finalize(this.command.conversationId, this.messageId, state, this.nextKey(`terminal:${state}`), stopReason);
+        return this.receipt ?? receipt;
+    }
+    nextKey(operation) {
+        this.sequence += 1;
+        return `${this.command.idempotencyKey}:${operation}:${this.sequence}`;
+    }
+    assertActive() {
+        if (this.terminated)
+            throw new Error("message stream is already terminated");
+    }
+}
 /** Device-agent composition for the Message SDK 2.x Node runtime. */
 export class DeviceMessageClient extends EventEmitter {
     messages;
@@ -12,11 +139,12 @@ export class DeviceMessageClient extends EventEmitter {
     lastConnection = "disconnected";
     constructor(options) {
         super();
-        this.client = createMessageClient(createNodeMessageClientComposition({
+        const composition = createNodeMessageClientComposition({
             identityId: options.identityId,
             serviceUrl: options.serviceUrl,
             tokenProvider: options.tokenProvider,
-        }));
+        });
+        this.client = createMessageClient(composition);
         this.messages = {
             send: async (input) => {
                 const messageId = input.id ?? randomUUID();
@@ -31,7 +159,7 @@ export class DeviceMessageClient extends EventEmitter {
             },
             startStream: (input) => {
                 const messageId = input.id ?? randomUUID();
-                return this.client.messages.startStream({
+                return new DrainableMessageReplyStream(composition.messageStream, {
                     conversationId: input.conversationId,
                     clientMessageId: messageId,
                     idempotencyKey: messageId,

package/dist/messaging/message-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-client.js","sourceRoot":"","sources":["../../src/messaging/message-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"message-client.js","sourceRoot":"","sources":["../../src/messaging/message-client.ts"],"names":[],"mappings":"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"}

package/dist/plugins/message-bus/inbound.js

@@ -94,6 +94,16 @@ export function buildMessageBusInboundHandler(opts) {
             files: prompt.files.length,
         }, "message-bus: turn started");
         try {
+            // Match OpenClaw's ordering: establish the durable streaming reply
+            // before invoking the model. This prevents the first visible chunks
+            // from sitting behind the initial POST in the SDK write queue.
+            await notifier.opened().catch((error) => {
+                opts.logger.warn({
+                    channelId: prompt.channelId,
+                    inboundMessageId: prompt.messageId,
+                    err: error instanceof Error ? error.message : String(error),
+                }, "message-bus: reply stream open probe failed; continuing for terminal fallback");
+            });
             const result = await opts.sessionManager.promptForSession(sid, promptText, extractTurnExecutionOptions(msg.content));
             opts.logger.info({
                 sid,

package/dist/plugins/message-bus/inbound.js.map

@@ -1 +1 @@
-{"version":3,"file":"inbound.js","sourceRoot":"","sources":["../../../src/plugins/message-bus/inbound.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inbound.js","sourceRoot":"","sources":["../../../src/plugins/message-bus/inbound.ts"],"names":[],"mappings":"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"}

package/dist/plugins/message-bus/ms-channel-notifier.d.ts

@@ -73,24 +73,23 @@ export declare class MsChannelNotifier implements SessionUpdateNotifier {
     private readonly sleep;
     private readonly stream;
     private streamFlushTimer;
+    private streamDrain;
     private pendingBodyText;
+    private handleQueue;
+    /** Current prose segment, committed to parts only at a tool/terminal boundary. */
     private pendingReplyText;
     private pendingReasoningText;
     private reasoningText;
     private reasoningPartIndex;
-    private activeTextPart;
     private nextPartSequence;
     private readonly toolParts;
     constructor(opts: MsChannelNotifierOptions);
     /** Durable reply id targeted by Message Service `chat_cancel` envelopes. */
     get replyMessageId(): string | undefined;
-    /**
-     * Called by SessionManager for every `session/update` envelope on
-     * this notifier's bound sid. Fire-and-forget: the SessionManager
-     * event hot path is synchronous, so we kick off the publish in the
-     * background and never block.
-     */
-    send(_sessionId: string, update: Record<string, unknown>): void;
+    /** Wait until the v3 reply row exists before starting the model run. */
+    opened(): Promise<void>;
+    /** Process updates in source order and expose backpressure to SessionManager. */
+    send(_sessionId: string, update: Record<string, unknown>): Promise<void>;
     /**
      * Cumulative reply text emitted so far. Exposed for diagnostics +
      * tests; not part of any wire contract.
@@ -111,19 +110,32 @@ export declare class MsChannelNotifier implements SessionUpdateNotifier {
     private publishFinal;
     private publishFinalOnce;
     private scheduleStreamFlush;
-    private flushStreamDeltas;
+    /**
+     * Persist at most one small body frame, then wait for Message Service.
+     * This is the backpressure boundary that prevents a fast VLM from building
+     * an unbounded serialized HTTP queue inside MessageStreamWriter.
+     */
+    private drainStreamBatch;
+    /** Drain every pending frame before a tool/terminal ordering boundary. */
+    private drainStreamDeltas;
     private publishReasoning;
     /**
-     * Keep one mutable wire text part per uninterrupted prose segment. Token
-     * deltas replace that part in place; a tool call closes it so later prose
-     * receives a new sequence number and can render after the tool card.
+     * Freeze one prose segment before a tool card or terminal state. Live text
+     * stays on the append-only body wire; Web derives the uncommitted suffix
+     * from that body, so token updates do not enqueue an additional setParts
+     * request for every flush.
      */
-    private publishText;
-    private finishText;
+    private commitTextSegment;
     private finishReasoning;
     private publishToolCall;
     private publishToolUpdate;
     private appendFilePart;
+    /**
+     * Produce a harmless prose separator after a parts mutation. Besides making
+     * adjacent VLM rounds readable, this creates the canonical message.delta
+     * that Message Service uses to fan the latest tool parts out in real time.
+     */
+    private appendToolBoundaryText;
     private partSequence;
     private logTerminalDelivered;
     private logTerminalFailure;

package/dist/plugins/message-bus/ms-channel-notifier.js

@@ -49,9 +49,13 @@ const DELTA_MAX_ATTEMPTS = 3;
 const TERMINAL_MAX_ATTEMPTS = 8;
 const RETRY_BASE_MS = 500;
 const RETRY_CAP_MS = 30_000;
-// Message SDK serializes every stream mutation over HTTP. Coalesce token-sized
-// updates so a terminal/cancel is never stuck behind hundreds of queued writes.
-const STREAM_FLUSH_MS = 750;
+// Bound the producer to one Message Service mutation at a time. Phone VLMs can
+// emit many one-character deltas per second while a remote PATCH takes tens or
+// hundreds of milliseconds; queueing every timer tick makes later rounds lag
+// behind the phone and then arrive in bursts.
+const STREAM_FLUSH_MS = 40;
+const STREAM_BODY_CHUNK_CHARS = 12;
+const TOOL_BOUNDARY_TEXT = "\n";
 const realSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 export class MsChannelNotifier {
     opts;
@@ -66,12 +70,14 @@ export class MsChannelNotifier {
     sleep;
     stream;
     streamFlushTimer = null;
+    streamDrain = null;
     pendingBodyText = "";
+    handleQueue = Promise.resolve();
+    /** Current prose segment, committed to parts only at a tool/terminal boundary. */
     pendingReplyText = "";
     pendingReasoningText = "";
     reasoningText = "";
     reasoningPartIndex = null;
-    activeTextPart = null;
     nextPartSequence = 0;
     toolParts = new Map();
     constructor(opts) {
@@ -89,14 +95,15 @@ export class MsChannelNotifier {
     get replyMessageId() {
         return this.stream?.id;
     }
-    /**
-     * Called by SessionManager for every `session/update` envelope on
-     * this notifier's bound sid. Fire-and-forget: the SessionManager
-     * event hot path is synchronous, so we kick off the publish in the
-     * background and never block.
-     */
+    /** Wait until the v3 reply row exists before starting the model run. */
+    async opened() {
+        await this.stream?.opened();
+    }
+    /** Process updates in source order and expose backpressure to SessionManager. */
     send(_sessionId, update) {
-        void this.handle(update);
+        const queued = this.handleQueue.then(() => this.handle(update));
+        this.handleQueue = queued.catch(() => undefined);
+        return queued;
     }
     /**
      * Cumulative reply text emitted so far. Exposed for diagnostics +
@@ -111,6 +118,7 @@ export class MsChannelNotifier {
     }
     /** Ensure the durable reply reaches a terminal state before unbinding it. */
     async finish(stopReason, errorText = "", task = null) {
+        await this.handleQueue;
         await this.publishFinal(stopReason, errorText, task);
     }
     async handle(update) {
@@ -137,11 +145,11 @@ export class MsChannelNotifier {
                     return;
                 }
                 case "tool_call": {
-                    this.publishToolCall(update);
+                    await this.publishToolCall(update);
                     return;
                 }
                 case "tool_call_update": {
-                    this.publishToolUpdate(update);
+                    await this.publishToolUpdate(update);
                     return;
                 }
                 case "stream_complete": {
@@ -222,8 +230,8 @@ export class MsChannelNotifier {
     async publishFinalOnce(stopReason, errorText, task) {
         if (this.stream) {
             try {
-                this.flushStreamDeltas();
-                this.finishText();
+                await this.drainStreamDeltas();
+                this.commitTextSegment();
                 this.finishReasoning();
                 const taskPayload = taskContent(task);
                 if (Object.keys(taskPayload).length > 0) {
@@ -308,34 +316,84 @@ export class MsChannelNotifier {
         }
     }
     scheduleStreamFlush() {
-        if (!this.stream || this.streamFlushTimer || this.finalized)
+        if (!this.stream
+            || this.streamFlushTimer
+            || this.streamDrain
+            || this.finalized)
             return;
         this.streamFlushTimer = setTimeout(() => {
             this.streamFlushTimer = null;
             if (!this.finalized && !this.stream?.isTerminated) {
-                this.flushStreamDeltas();
+                void this.drainStreamBatch().catch((err) => {
+                    this.opts.logger.error({
+                        ...describeError(err),
+                        channelId: this.opts.channelId,
+                    }, "ms-channel-notifier: live stream drain failed");
+                });
             }
         }, STREAM_FLUSH_MS);
     }
-    flushStreamDeltas() {
+    /**
+     * Persist at most one small body frame, then wait for Message Service.
+     * This is the backpressure boundary that prevents a fast VLM from building
+     * an unbounded serialized HTTP queue inside MessageStreamWriter.
+     */
+    async drainStreamBatch() {
+        if (!this.stream || this.streamDrain) {
+            await this.streamDrain;
+            return;
+        }
+        if (this.streamFlushTimer) {
+            clearTimeout(this.streamFlushTimer);
+            this.streamFlushTimer = null;
+        }
+        const run = (async () => {
+            const reasoning = this.pendingReasoningText;
+            const { head: body, tail } = takeStreamBodyChunk(this.pendingBodyText, STREAM_BODY_CHUNK_CHARS);
+            this.pendingReasoningText = "";
+            this.pendingBodyText = tail;
+            if (reasoning)
+                this.publishReasoning(reasoning);
+            if (body)
+                this.stream?.appendBody(body);
+            if (reasoning || body)
+                await this.stream?.flush();
+        })();
+        this.streamDrain = run;
+        let succeeded = false;
+        try {
+            await run;
+            succeeded = true;
+        }
+        finally {
+            this.streamDrain = null;
+            if (succeeded && (this.pendingReasoningText || this.pendingBodyText)) {
+                this.scheduleStreamFlush();
+            }
+        }
+    }
+    /** Drain every pending frame before a tool/terminal ordering boundary. */
+    async drainStreamDeltas() {
         if (!this.stream)
             return;
         if (this.streamFlushTimer) {
             clearTimeout(this.streamFlushTimer);
             this.streamFlushTimer = null;
         }
-        const reasoning = this.pendingReasoningText;
-        const body = this.pendingBodyText;
-        const reply = this.pendingReplyText;
-        this.pendingReasoningText = "";
-        this.pendingBodyText = "";
-        this.pendingReplyText = "";
-        if (reasoning)
-            this.publishReasoning(reasoning);
-        if (body)
-            this.stream.appendBody(body);
-        if (reply)
-            this.publishText(reply);
+        while (this.streamDrain
+            || this.pendingReasoningText.length > 0
+            || this.pendingBodyText.length > 0) {
+            if (this.streamDrain) {
+                await this.streamDrain;
+            }
+            else {
+                await this.drainStreamBatch();
+            }
+            if (this.streamFlushTimer) {
+                clearTimeout(this.streamFlushTimer);
+                this.streamFlushTimer = null;
+            }
+        }
     }
     publishReasoning(text) {
         if (!this.stream || !text)
@@ -356,38 +414,21 @@ export class MsChannelNotifier {
         }
     }
     /**
-     * Keep one mutable wire text part per uninterrupted prose segment. Token
-     * deltas replace that part in place; a tool call closes it so later prose
-     * receives a new sequence number and can render after the tool card.
+     * Freeze one prose segment before a tool card or terminal state. Live text
+     * stays on the append-only body wire; Web derives the uncommitted suffix
+     * from that body, so token updates do not enqueue an additional setParts
+     * request for every flush.
      */
-    publishText(text) {
-        if (!this.stream || !text)
-            return;
-        if (this.activeTextPart === null) {
-            const seq = this.partSequence();
-            const index = this.stream.parts.length;
-            this.activeTextPart = { index, seq, text };
-            this.stream.addPart({ type: "text", text, state: "streaming", _seq: seq });
+    commitTextSegment() {
+        if (!this.stream || !this.pendingReplyText)
             return;
-        }
-        this.activeTextPart.text += text;
-        this.stream.replacePart(this.activeTextPart.index, {
-            type: "text",
-            text: this.activeTextPart.text,
-            state: "streaming",
-            _seq: this.activeTextPart.seq,
-        });
-    }
-    finishText() {
-        if (!this.stream || this.activeTextPart === null)
-            return;
-        this.stream.replacePart(this.activeTextPart.index, {
+        this.stream.addPart({
             type: "text",
-            text: this.activeTextPart.text,
+            text: this.pendingReplyText,
             state: "done",
-            _seq: this.activeTextPart.seq,
+            _seq: this.partSequence(),
         });
-        this.activeTextPart = null;
+        this.pendingReplyText = "";
     }
     finishReasoning() {
         if (!this.stream || this.reasoningPartIndex === null)
@@ -399,14 +440,14 @@ export class MsChannelNotifier {
             _seq: this.reasoningPartIndex,
         });
     }
-    publishToolCall(update) {
+    async publishToolCall(update) {
         if (!this.stream)
             return;
         const id = pickString(update.toolCallId);
         if (!id || this.toolParts.has(id))
             return;
-        this.flushStreamDeltas();
-        this.finishText();
+        await this.drainStreamDeltas();
+        this.commitTextSegment();
         const name = pickString(update.title) || "device_action";
         const args = parseJsonValue(update.arguments);
         const useIndex = this.stream.parts.length;
@@ -419,8 +460,15 @@ export class MsChannelNotifier {
             _seq: this.partSequence(),
         });
         this.toolParts.set(id, { useIndex, name, args });
-    }
-    publishToolUpdate(update) {
+        this.appendToolBoundaryText();
+        // SessionManager awaits notifier.send(). Make that boundary mean the
+        // narration and action card reached Message Service before MCP touches
+        // the phone. Message Service intentionally does not broadcast parts-only
+        // PATCHes, so the trailing text boundary supplies the delta event that
+        // carries the newly persisted parts to Web/Mobile observers.
+        await this.stream.flush();
+    }
+    async publishToolUpdate(update) {
         if (!this.stream)
             return;
         const id = pickString(update.toolCallId);
@@ -428,7 +476,7 @@ export class MsChannelNotifier {
             return;
         let tool = this.toolParts.get(id);
         if (!tool) {
-            this.publishToolCall({
+            await this.publishToolCall({
                 ...update,
                 title: pickString(update.title) || "device_action",
                 arguments: update.arguments ?? "{}",
@@ -463,6 +511,8 @@ export class MsChannelNotifier {
             else {
                 this.stream.replacePart(tool.progressIndex, result);
             }
+            this.appendToolBoundaryText();
+            await this.stream.flush();
             return;
         }
         if (update.output === undefined)
@@ -481,6 +531,7 @@ export class MsChannelNotifier {
         else {
             this.stream.replacePart(tool.progressIndex, progress);
         }
+        await this.stream.flush();
     }
     appendFilePart(file) {
         if (!this.stream)
@@ -493,6 +544,18 @@ export class MsChannelNotifier {
             _seq: this.partSequence(),
         });
     }
+    /**
+     * Produce a harmless prose separator after a parts mutation. Besides making
+     * adjacent VLM rounds readable, this creates the canonical message.delta
+     * that Message Service uses to fan the latest tool parts out in real time.
+     */
+    appendToolBoundaryText() {
+        if (!this.stream)
+            return;
+        this.accumulatedText += TOOL_BOUNDARY_TEXT;
+        this.pendingReplyText += TOOL_BOUNDARY_TEXT;
+        this.stream.appendBody(TOOL_BOUNDARY_TEXT);
+    }
     partSequence() {
         return this.nextPartSequence++;
     }
@@ -556,6 +619,15 @@ export class MsChannelNotifier {
         }
     }
 }
+function takeStreamBodyChunk(body, maxChars) {
+    if (!body)
+        return { head: "", tail: "" };
+    const codePoints = Array.from(body);
+    return {
+        head: codePoints.slice(0, maxChars).join(""),
+        tail: codePoints.slice(maxChars).join(""),
+    };
+}
 function pickTaskOutcome(value) {
     if (!value || typeof value !== "object")
         return null;