shennian 0.2.49 → 0.2.51

package/dist/src/agents/custom.d.ts

@@ -13,6 +13,8 @@ export declare class CustomAgentAdapter extends AgentAdapter {
     private seq;
     private stdioProcess;
     private spawnProcess;
+    private dispatchGuard;
+    private dispatchObservedEvent;
     constructor(name: string, entry: CustomAgentEntry);
     start(sessionId: string, workDir: string, agentSessionId?: string | null): Promise<void>;
     send(text: string, modelId?: string): Promise<void>;
@@ -25,6 +27,9 @@ export declare class CustomAgentAdapter extends AgentAdapter {
     private stopStdioProcess;
     private attachOutputHandlers;
     private handleProtocolEvent;
+    private startDispatchGuard;
+    private acceptDispatch;
+    private rejectDispatch;
     private emitEvent;
 }
 export declare function registerCustomAgent(name: string, entry: CustomAgentEntry): void;

package/dist/src/agents/custom.js

@@ -4,6 +4,7 @@ import { randomUUID } from 'node:crypto';
 import { AgentAdapter, registerAgent } from './adapter.js';
 import { spawnCommandString } from './command-spec.js';
 import { buildAgentProcessEnv } from '../agent-env.js';
+const DISPATCH_GUARD_MS = 3000;
 export class CustomAgentAdapter extends AgentAdapter {
     type;
     command;
@@ -18,6 +19,8 @@ export class CustomAgentAdapter extends AgentAdapter {
     stdioProcess = null;
     // spawn mode: current single-turn process
     spawnProcess = null;
+    dispatchGuard = null;
+    dispatchObservedEvent = false;
     constructor(name, entry) {
         super();
         this.type = `custom:${name}`;
@@ -66,6 +69,8 @@ export class CustomAgentAdapter extends AgentAdapter {
     // ─── Spawn mode ───────────────────────────────────────────────────────────
     async runSpawn(text, modelId) {
         await this.killSpawnProcess();
+        const guard = this.startDispatchGuard();
+        this.dispatchObservedEvent = false;
         const args = ['/run', '--workdir', this.workDir ?? process.cwd()];
         if (this.sessionId)
             args.push('--session', this.sessionId);
@@ -83,8 +88,10 @@ export class CustomAgentAdapter extends AgentAdapter {
             if (this.spawnProcess === proc)
                 this.spawnProcess = null;
         });
+        proc.stdin?.once('error', (error) => this.rejectDispatch(error));
         proc.stdin?.write(text);
         proc.stdin?.end();
+        await guard.promise;
     }
     async killSpawnProcess() {
         const proc = this.spawnProcess;
@@ -116,6 +123,8 @@ export class CustomAgentAdapter extends AgentAdapter {
         if (!this.stdioProcess) {
             await this.startStdioProcess();
         }
+        const guard = this.startDispatchGuard();
+        this.dispatchObservedEvent = false;
         const msg = JSON.stringify({
             method: 'send',
             id: randomUUID(),
@@ -125,7 +134,9 @@ export class CustomAgentAdapter extends AgentAdapter {
                 modelId,
             },
         });
+        this.stdioProcess?.stdin?.once('error', (error) => this.rejectDispatch(error));
         this.stdioProcess?.stdin?.write(msg + '\n');
+        await guard.promise;
     }
     async stopStdioProcess() {
         const proc = this.stdioProcess;
@@ -165,11 +176,19 @@ export class CustomAgentAdapter extends AgentAdapter {
             onClose();
             if (code !== 0 && code !== null) {
                 const msg = stderrBuf.trim() || `Agent exited with code ${code}`;
+                this.rejectDispatch(new Error(msg));
                 this.emitEvent({ state: 'error', message: msg });
             }
+            else if (!this.dispatchObservedEvent) {
+                this.rejectDispatch(new Error('Custom agent exited without protocol events'));
+            }
+            else {
+                this.acceptDispatch();
+            }
         });
         proc.on('error', (err) => {
             onClose();
+            this.rejectDispatch(err);
             this.emit('error', err);
         });
     }
@@ -177,29 +196,70 @@ export class CustomAgentAdapter extends AgentAdapter {
         const { state } = event;
         if (!state)
             return;
+        this.dispatchObservedEvent = true;
         switch (state) {
             case 'delta':
+                this.acceptDispatch();
                 this.emitEvent({ state: 'delta', text: event.text ?? '', thinking: event.thinking });
                 break;
             case 'final':
+                this.acceptDispatch();
                 if (event.agentSessionId)
                     this.agentSessionId = event.agentSessionId;
                 this.emitEvent({ state: 'final', usage: event.usage, agentSessionId: this.agentSessionId ?? undefined });
                 break;
             case 'error':
+                this.rejectDispatch(new Error(event.message ?? 'unknown error'));
                 this.emitEvent({ state: 'error', message: event.message ?? 'unknown error' });
                 break;
             case 'tool-call':
+                this.acceptDispatch();
                 this.emitEvent({ state: 'tool-call', name: event.name ?? '', args: event.args });
                 break;
             case 'tool-result':
+                this.acceptDispatch();
                 this.emitEvent({ state: 'tool-result', name: event.name ?? '', result: event.result ?? '' });
                 break;
             case 'notify':
+                this.acceptDispatch();
                 this.emitEvent({ state: 'notify', text: event.text ?? '', title: event.title, source: event.source });
                 break;
         }
     }
+    startDispatchGuard() {
+        this.acceptDispatch();
+        let guard;
+        const promise = new Promise((resolve, reject) => {
+            guard = {
+                settled: false,
+                timer: setTimeout(() => this.acceptDispatch(guard), DISPATCH_GUARD_MS),
+                resolve,
+                reject,
+                promise: Promise.resolve(),
+            };
+        });
+        guard.promise = promise;
+        this.dispatchGuard = guard;
+        return guard;
+    }
+    acceptDispatch(guard = this.dispatchGuard) {
+        if (!guard || guard.settled)
+            return;
+        guard.settled = true;
+        clearTimeout(guard.timer);
+        if (this.dispatchGuard === guard)
+            this.dispatchGuard = null;
+        guard.resolve();
+    }
+    rejectDispatch(error, guard = this.dispatchGuard) {
+        if (!guard || guard.settled)
+            return;
+        guard.settled = true;
+        clearTimeout(guard.timer);
+        if (this.dispatchGuard === guard)
+            this.dispatchGuard = null;
+        guard.reject(error);
+    }
     emitEvent(partial) {
         const event = { ...partial, runId: this.runId, seq: this.seq++ };
         this.emit('agentEvent', event);

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.51",
   "description": "Shennian — AI Agent Control Plane CLI",
   "type": "module",
   "bin": {