shennian 0.2.49 → 0.2.50

package/dist/src/session/handlers/chat.js

@@ -283,7 +283,7 @@ export async function handleChatSend(runtime, req) {
         return;
     }
     rememberProcessedReqId(runtime, req.id);
-    const { sessionId, text, agentType, workDir, agentSessionId: incomingAgentSid, modelId, clientMessageId, sessionListProjection } = req.params;
+    const { sessionId, text, agentType, workDir, agentSessionId: incomingAgentSid, modelId, clientMessageId, sessionListProjection, waitForDispatch } = req.params;
     mergeProjectedSessions(sessionListProjection);
     if (!sessionId || !text) {
         runtime.processedReqIds.delete(req.id);
@@ -354,23 +354,6 @@ export async function handleChatSend(runtime, req) {
             return;
         }
     }
-    sendSessionUpdateEvent(runtime, {
-        sessionId,
-        agentType: requestedAgentType,
-        workDir: resolvedWorkDir,
-        agentSessionId: session.agentSessionId ?? incomingAgentSid ?? null,
-        modelId,
-    });
-    session.currentRunId = null;
-    session.nextEventSeq = 0;
-    runtime.nativeFusion?.registerManagedSend({
-        sessionId,
-        agentType: requestedAgentType,
-        sourceAgentType: getNativeSourceAgentType(requestedAgentType, modelId),
-        canonicalMessageId: clientMessageId ?? null,
-        sourceSessionKey: session.agentSessionId ?? incomingAgentSid ?? null,
-        text,
-    });
     const userEnvelope = {
         id: clientMessageId ?? `user-${req.id}`,
         sessionId,
@@ -378,36 +361,39 @@ export async function handleChatSend(runtime, req) {
         ts: Date.now(),
         payload: text,
     };
-    appendMessage(sessionId, userEnvelope);
-    sendSessionMessageEvent(runtime, userEnvelope, {
-        agentType: requestedAgentType,
-        workDir: resolvedWorkDir,
-        agentSessionId: session.agentSessionId ?? incomingAgentSid ?? null,
-        modelId,
-    });
     reportLog({
         level: 'info',
         sessionId,
         wsEvent: 'chat.send.start',
         metadata: { reqId: req.id, agentType: requestedAgentType, modelId },
     });
-    runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
-    reportLog({
-        level: 'info',
-        sessionId,
-        wsEvent: 'chat.send.res',
-        metadata: { reqId: req.id, ok: true },
-    });
-    void session.adapter.send(text, modelId)
-        .then(() => {
-        reportLog({
-            level: 'info',
+    const markAccepted = () => {
+        sendSessionUpdateEvent(runtime, {
             sessionId,
-            wsEvent: 'chat.send.done',
-            metadata: { reqId: req.id },
+            agentType: requestedAgentType,
+            workDir: resolvedWorkDir,
+            agentSessionId: session.agentSessionId ?? incomingAgentSid ?? null,
+            modelId,
         });
-    })
-        .catch(async (err) => {
+        session.currentRunId = null;
+        session.nextEventSeq = 0;
+        runtime.nativeFusion?.registerManagedSend({
+            sessionId,
+            agentType: requestedAgentType,
+            sourceAgentType: getNativeSourceAgentType(requestedAgentType, modelId),
+            canonicalMessageId: clientMessageId ?? null,
+            sourceSessionKey: session.agentSessionId ?? incomingAgentSid ?? null,
+            text,
+        });
+        appendMessage(sessionId, userEnvelope);
+        sendSessionMessageEvent(runtime, userEnvelope, {
+            agentType: requestedAgentType,
+            workDir: resolvedWorkDir,
+            agentSessionId: session.agentSessionId ?? incomingAgentSid ?? null,
+            modelId,
+        });
+    };
+    const handleSendFailure = async (err, respondToReq) => {
         const message = `Agent send failed: ${err instanceof Error ? err.message : String(err)}`;
         console.error(`[chat.send] send failed reqId=${req.id} sessionId=${sessionId} agentType=${agentType} workDir=${resolvedWorkDir} agentSessionId=${session.agentSessionId ?? incomingAgentSid ?? ''}: ${message}`);
         runtime.sessions.delete(sessionId);
@@ -426,6 +412,59 @@ export async function handleChatSend(runtime, req) {
                 seq: 0,
             },
         });
+        if (respondToReq) {
+            runtime.processedReqIds.delete(req.id);
+            runtime.client.sendRes({
+                type: 'res',
+                id: req.id,
+                ok: false,
+                error: message,
+            });
+        }
+    };
+    if (waitForDispatch) {
+        try {
+            await session.adapter.send(text, modelId);
+            reportLog({
+                level: 'info',
+                sessionId,
+                wsEvent: 'chat.send.done',
+                metadata: { reqId: req.id },
+            });
+        }
+        catch (err) {
+            await handleSendFailure(err, true);
+            return;
+        }
+        markAccepted();
+        runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
+        reportLog({
+            level: 'info',
+            sessionId,
+            wsEvent: 'chat.send.res',
+            metadata: { reqId: req.id, ok: true },
+        });
+        return;
+    }
+    markAccepted();
+    runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
+    reportLog({
+        level: 'info',
+        sessionId,
+        wsEvent: 'chat.send.res',
+        metadata: { reqId: req.id, ok: true },
+    });
+    void session.adapter.send(text, modelId)
+        .then(() => {
+        reportLog({
+            level: 'info',
+            sessionId,
+            wsEvent: 'chat.send.done',
+            metadata: { reqId: req.id },
+        });
+    })
+        .catch((err) => {
+        void handleSendFailure(err, false);
     });
 }
 export async function handleChatAbort(runtime, req) {

package/dist/src/session/queue.js

@@ -87,12 +87,14 @@ export class ChatQueueManager {
         const active = runtime.sessions.get(params.sessionId);
         const isBusy = Boolean(active?.currentRunId);
         if (!isBusy && !(readQueue().sessions[params.sessionId]?.length)) {
-            await this.dispatchQueuedMessage(queueMessageFromParams(params));
-            runtime.client.sendRes({
-                type: 'res',
-                id: req.id,
-                ok: true,
-                payload: { queued: false, queue: this.getSnapshot(params.sessionId) },
+            await this.opts.dispatchReq({
+                ...req,
+                method: 'chat.send',
+                params: {
+                    ...params,
+                    clientMessageId: params.clientMessageId ?? params.queueMessageId,
+                    waitForDispatch: true,
+                },
             });
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shennian",
-  "version": "0.2.49",
+  "version": "0.2.50",
   "description": "Shennian — AI Agent Control Plane CLI",
   "type": "module",
   "bin": {