shennian 0.1.21 → 0.1.22

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

@@ -9,6 +9,13 @@ function extractSummary(text) {
 }
 function bindAdapterEvents(runtime, sessionId, agentType, adapter) {
     adapter.on('agentEvent', (event) => {
+        const activeSession = runtime.sessions.get(sessionId);
+        if (activeSession) {
+            activeSession.currentRunId = event.runId;
+            activeSession.nextEventSeq = event.seq + 1;
+            if (event.agentSessionId)
+                activeSession.agentSessionId = event.agentSessionId;
+        }
         const runKey = `${sessionId}:${event.runId}`;
         if (event.state === 'delta' && !event.thinking && event.text) {
             runtime.runTextAcc.set(runKey, (runtime.runTextAcc.get(runKey) ?? '') + event.text);
@@ -36,6 +43,11 @@ function bindAdapterEvents(runtime, sessionId, agentType, adapter) {
         else if (event.state === 'error' || event.state === 'aborted') {
             runtime.runTextAcc.delete(runKey);
         }
+        if ((event.state === 'final' || event.state === 'error' || event.state === 'aborted') &&
+            activeSession?.currentRunId === event.runId) {
+            activeSession.currentRunId = null;
+            activeSession.nextEventSeq = 0;
+        }
         runtime.client.sendAgentEvent({
             type: 'event',
             event: 'agent',
@@ -53,40 +65,102 @@ function bindAdapterEvents(runtime, sessionId, agentType, adapter) {
         });
     });
 }
+function rememberProcessedReqId(runtime, reqId) {
+    runtime.processedReqIds.add(reqId);
+    if (runtime.processedReqIds.size > 1000) {
+        const first = runtime.processedReqIds.values().next().value;
+        runtime.processedReqIds.delete(first);
+    }
+}
+async function disposeSession(session) {
+    session.adapter.removeAllListeners();
+    await session.adapter.stop().catch(() => { });
+}
+async function createActiveSession(runtime, sessionId, agentType, resolvedWorkDir, incomingAgentSid) {
+    runtime.evictIdleSessions();
+    const adapter = createAgent(agentType);
+    if (!adapter)
+        throw new Error(`Unsupported agent: ${agentType}`);
+    await adapter.start(sessionId, resolvedWorkDir, incomingAgentSid);
+    const session = {
+        adapter,
+        workDir: resolvedWorkDir,
+        agentType,
+        agentSessionId: incomingAgentSid ?? null,
+        lastActiveAt: Date.now(),
+        currentRunId: null,
+        nextEventSeq: 0,
+    };
+    runtime.sessions.set(sessionId, session);
+    bindAdapterEvents(runtime, sessionId, agentType, adapter);
+    return session;
+}
+function emitSyntheticAbort(runtime, sessionId) {
+    const session = runtime.sessions.get(sessionId);
+    const runId = session?.currentRunId;
+    if (!session || !runId)
+        return;
+    const seq = session.nextEventSeq;
+    runtime.runTextAcc.delete(`${sessionId}:${runId}`);
+    session.currentRunId = null;
+    session.nextEventSeq = 0;
+    runtime.client.sendAgentEvent({
+        type: 'event',
+        event: 'agent',
+        payload: { state: 'aborted', sessionId, runId, seq },
+        seq,
+        id: `agent-evt-${runId}-${seq}`,
+    });
+}
 export async function handleChatSend(runtime, req) {
     if (runtime.processedReqIds.has(req.id)) {
         runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
         return;
     }
-    runtime.processedReqIds.add(req.id);
-    if (runtime.processedReqIds.size > 1000) {
-        const first = runtime.processedReqIds.values().next().value;
-        runtime.processedReqIds.delete(first);
-    }
+    rememberProcessedReqId(runtime, req.id);
     const { sessionId, text, agentType, workDir, agentSessionId: incomingAgentSid, modelId } = req.params;
     if (!sessionId || !text) {
+        runtime.processedReqIds.delete(req.id);
         runtime.client.sendRes({ type: 'res', id: req.id, ok: false, error: 'sessionId and text are required' });
         return;
     }
+    const resolvedWorkDir = runtime.resolvePath(workDir || os.homedir());
+    const requestedAgentType = agentType;
     let session = runtime.sessions.get(sessionId);
-    runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
     if (session) {
         session.lastActiveAt = Date.now();
+        const sessionDrifted = session.agentType !== requestedAgentType ||
+            session.workDir !== resolvedWorkDir;
+        if (sessionDrifted) {
+            runtime.sessions.delete(sessionId);
+            try {
+                await disposeSession(session);
+            }
+            catch {
+                runtime.processedReqIds.delete(req.id);
+            }
+            session = undefined;
+        }
+        else if (incomingAgentSid && session.agentSessionId !== incomingAgentSid) {
+            try {
+                await session.adapter.resume(incomingAgentSid);
+                session.agentSessionId = incomingAgentSid;
+            }
+            catch {
+                runtime.sessions.delete(sessionId);
+                try {
+                    await disposeSession(session);
+                }
+                catch {
+                    runtime.processedReqIds.delete(req.id);
+                }
+                session = undefined;
+            }
+        }
     }
     if (!session) {
-        runtime.evictIdleSessions();
-        const adapter = createAgent(agentType);
-        if (!adapter) {
-            runtime.client.sendEvent({
-                type: 'event',
-                event: 'agent',
-                payload: { state: 'error', sessionId, message: `Unsupported agent: ${agentType}`, runId: '', seq: 0 },
-            });
-            return;
-        }
-        const resolvedWorkDir = runtime.resolvePath(workDir || os.homedir());
         try {
-            await adapter.start(sessionId, resolvedWorkDir, incomingAgentSid);
+            session = await createActiveSession(runtime, sessionId, requestedAgentType, resolvedWorkDir, incomingAgentSid);
         }
         catch (err) {
             runtime.client.sendEvent({
@@ -95,27 +169,38 @@ export async function handleChatSend(runtime, req) {
                 payload: {
                     state: 'error',
                     sessionId,
-                    message: `Failed to start ${agentType}: ${err instanceof Error ? err.message : String(err)}`,
+                    message: err instanceof Error && err.message.startsWith('Unsupported agent:')
+                        ? err.message
+                        : `Failed to start ${agentType}: ${err instanceof Error ? err.message : String(err)}`,
                     runId: '',
                     seq: 0,
                 },
             });
+            runtime.processedReqIds.delete(req.id);
+            runtime.client.sendRes({
+                type: 'res',
+                id: req.id,
+                ok: false,
+                error: err instanceof Error && err.message.startsWith('Unsupported agent:')
+                    ? err.message
+                    : `Failed to start ${agentType}: ${err instanceof Error ? err.message : String(err)}`,
+            });
             return;
         }
-        session = {
-            adapter,
-            workDir: resolvedWorkDir,
-            agentType: agentType,
-            lastActiveAt: Date.now(),
-        };
-        runtime.sessions.set(sessionId, session);
-        bindAdapterEvents(runtime, sessionId, agentType, adapter);
     }
     try {
+        session.currentRunId = null;
+        session.nextEventSeq = 0;
         await session.adapter.send(text, modelId);
+        runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
     }
     catch (err) {
         runtime.sessions.delete(sessionId);
+        try {
+            await disposeSession(session);
+        }
+        catch { /* best-effort cleanup */ }
+        runtime.processedReqIds.delete(req.id);
         runtime.client.sendEvent({
             type: 'event',
             event: 'agent',
@@ -127,13 +212,23 @@ export async function handleChatSend(runtime, req) {
                 seq: 0,
             },
         });
+        runtime.client.sendRes({
+            type: 'res',
+            id: req.id,
+            ok: false,
+            error: `Agent send failed: ${err instanceof Error ? err.message : String(err)}`,
+        });
     }
 }
 export async function handleChatAbort(runtime, req) {
     const { sessionId } = req.params;
     const session = runtime.sessions.get(sessionId);
     if (session) {
-        await session.adapter.stop();
+        try {
+            await session.adapter.stop();
+        }
+        catch { /* best-effort: still emit synthetic abort below */ }
+        emitSyntheticAbort(runtime, sessionId);
     }
     runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
 }

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

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

package/dist/src/session/types.d.ts

@@ -5,7 +5,10 @@ export type ActiveSession = {
     adapter: AgentAdapter;
     workDir: string;
     agentType: AgentType;
+    agentSessionId: string | null;
     lastActiveAt: number;
+    currentRunId: string | null;
+    nextEventSeq: number;
 };
 export type PendingTransfer = {
     tempPath: string;

package/dist/src/session/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/session/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,YAAY,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,cAAc,CAAA;IACtB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC9C,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,kBAAkB,EAAE,MAAM,IAAI,CAAA;IAC9B,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAA;IAC1C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACpC,iBAAiB,EAAE,MAAM,IAAI,CAAA;CAC9B,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/session/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,YAAY,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,cAAc,CAAA;IACtB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC9C,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,kBAAkB,EAAE,MAAM,IAAI,CAAA;IAC9B,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAA;IAC1C,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACpC,iBAAiB,EAAE,MAAM,IAAI,CAAA;CAC9B,CAAA"}