shennian 0.2.50 → 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/package.json

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