evolcore 0.0.22 → 0.0.24

package/dist/core/session/session-manager.js

@@ -557,13 +557,29 @@ export class SessionManager {
             }
             const wasBound = !!normalizeBackendSessionId(current.agentSessionId);
             const next = JSON.parse(JSON.stringify(current));
+            const previousBaseagent = next.baseagent;
+            if (input.baseagent !== undefined) {
+                const requested = input.baseagent.trim();
+                if (!requested) {
+                    const error = new Error('backend rotation baseagent must be non-empty');
+                    error.code = 'BASEAGENT_REQUIRED';
+                    throw error;
+                }
+                next.baseagent = requested;
+            }
             next.agentSessionId = undefined;
             const nextMetadata = { ...(next.metadata ?? {}) };
             delete nextMetadata.resumeAt;
             delete nextMetadata.agentSessions;
             next.metadata = nextMetadata;
             this.persistConfirmedTopicBoundary(current, found, next);
-            return { status: 'rotated', sessionId: input.sessionId, wasBound };
+            return {
+                status: 'rotated',
+                sessionId: input.sessionId,
+                wasBound,
+                previousBaseagent,
+                baseagent: next.baseagent,
+            };
         });
     }
     /**
@@ -830,7 +846,10 @@ export class SessionManager {
         const sessionMetadata = { ...(metadata || {}) };
         sessionMetadata.__sessionCreatedAt = Date.now();
         const newIdentity = identity ?? this.resolveIdentity(channel, userId, chatType, identityConversationId);
-        const resolvedBaseagent = baseagent || 'claude';
+        const resolvedBaseagent = typeof baseagent === 'string' ? baseagent.trim() : '';
+        if (!resolvedBaseagent) {
+            throw new Error(`[SessionManager] getOrCreateSession: baseagent is empty for channel=${channel} channelId=${channelId}`);
+        }
         const session = {
             id: generateSessionId(),
             channel,
@@ -857,6 +876,7 @@ export class SessionManager {
             projectPath: defaultProjectPath,
             name: session.name,
             chatType: session.chatType,
+            baseagent: session.baseagent,
             timestamp: Date.now(),
         });
         return session;
@@ -868,9 +888,9 @@ export class SessionManager {
         if (!loaded)
             return;
         const { current } = loaded;
-        if (current.threadId && updates.baseagent !== undefined) {
-            const error = new Error('topic baseagent is immutable while backend rotation is managed');
-            error.code = 'TOPIC_BASEAGENT_IMMUTABLE';
+        if (updates.baseagent !== undefined) {
+            const error = new Error('session baseagent is immutable; use explicit agent switch or backend rotation');
+            error.code = 'BASEAGENT_IMMUTABLE';
             throw error;
         }
         if (current.threadId && Object.prototype.hasOwnProperty.call(updates, 'agentSessionId')) {
@@ -878,8 +898,6 @@ export class SessionManager {
             error.code = 'TOPIC_BACKEND_BINDING_PROTECTED';
             throw error;
         }
-        if (updates.baseagent !== undefined)
-            current.baseagent = updates.baseagent;
         if (updates.chatType !== undefined)
             current.chatType = updates.chatType;
         if (updates.name !== undefined)
@@ -988,7 +1006,7 @@ export class SessionManager {
         const mainActive = readJsonFile(path.join(chatDir, 'active.json'));
         // 兼容旧字段名
         const mainBaseagent = mainActive?.baseagent || mainActive?.agentType;
-        const inheritedBaseagent = baseagent || mainBaseagent;
+        const inheritedBaseagent = mainBaseagent || baseagent;
         if (!inheritedBaseagent) {
             throw new Error('[SessionManager] getOrCreateThreadSession: baseagent is empty');
         }
@@ -1022,6 +1040,7 @@ export class SessionManager {
             channelId,
             projectPath,
             name: session.name,
+            baseagent: session.baseagent,
             timestamp: Date.now(),
         });
         return session;
@@ -1072,6 +1091,7 @@ export class SessionManager {
             channelId,
             projectPath: newProjectPath,
             name: session.name,
+            baseagent: session.baseagent,
             timestamp: Date.now(),
         });
         return session;
@@ -1180,6 +1200,7 @@ export class SessionManager {
             channelId,
             projectPath,
             name: session.name,
+            baseagent: session.baseagent,
             timestamp: Date.now(),
         });
         return session;
@@ -1428,7 +1449,7 @@ export class SessionManager {
             }
         }
     }
-    async createNewSession(channel, channelId, projectPath, name, baseagent, identityMetadata) {
+    async createNewSession(channel, channelId, projectPath, name, baseagent, identityMetadata, eventMetadata) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
         // Derive selfAID and channelType from existing sessions
         const existingDir = this.findExistingChatDir(channel, channelId);
@@ -1480,6 +1501,8 @@ export class SessionManager {
             channelId,
             projectPath,
             name: session.name,
+            baseagent: session.baseagent,
+            ...eventMetadata,
             timestamp: Date.now(),
         });
         return session;
@@ -1527,6 +1550,7 @@ export class SessionManager {
             channelId: sourceSession.channelId,
             projectPath: sourceSession.projectPath,
             name: session.name,
+            baseagent: session.baseagent,
             timestamp: Date.now(),
         });
         return session;
@@ -1602,6 +1626,7 @@ export class SessionManager {
             name: session.name,
             chatType: session.chatType,
             threadId: session.threadId,
+            baseagent: session.baseagent,
             timestamp: now,
         });
         return session;
@@ -1624,7 +1649,7 @@ export class SessionManager {
             selfAID: sourceSession.selfAID,
             projectPath: sourceSession.projectPath,
             threadId: '',
-            baseagent: sourceSession.baseagent,
+            baseagent: context?.baseagent || sourceSession.baseagent,
             sessionKey: formatSessionKey(sourceSession.channelType || sourceSession.channel, sourceSession.channelId, DEFAULT_THREAD_ID),
             chatType: sourceSession.chatType || 'private',
             metadata,
@@ -1642,6 +1667,7 @@ export class SessionManager {
             projectPath: session.projectPath,
             name: session.name,
             chatType: session.chatType,
+            baseagent: session.baseagent,
             cause: 'renew',
             sourceSessionId: sourceSession.id,
             renewSource: context?.source,
@@ -1684,6 +1710,12 @@ export class SessionManager {
             return false;
         return adapter.checkExists(projectPath, agentSessionId, agentAid);
     }
+    checkSessionTurnPersisted(projectPath, agentSessionId, baseagent, turnId, agentAid) {
+        const adapter = this.getFileAdapter(baseagent);
+        if (!adapter?.checkTurnPersisted)
+            return false;
+        return adapter.checkTurnPersisted(projectPath, agentSessionId, turnId, agentAid);
+    }
     readSessionFirstMessage(projectPath, agentSessionId, baseagent, agentAid) {
         const adapter = this.getFileAdapter(baseagent);
         if (!adapter)
@@ -1725,10 +1757,13 @@ export class SessionManager {
         }
         return matched[0];
     }
-    async importCliSession(channel, channelId, projectPath, agentSessionId, baseagent = 'claude', agentAid) {
+    async importCliSession(channel, channelId, projectPath, agentSessionId, baseagent, agentAid) {
+        const resolvedBaseagent = typeof baseagent === 'string' ? baseagent.trim() : '';
+        if (!resolvedBaseagent)
+            throw new Error('[SessionManager] importCliSession: baseagent is required');
         const inheritedChatType = this.getActiveChatType(channel, channelId);
         const resolvedAgentAid = agentAid || this.deriveChannelIdentity(channel, channelId).selfAID;
-        const fileInfo = this.getSessionFileInfo(projectPath, agentSessionId, baseagent, resolvedAgentAid);
+        const fileInfo = this.getSessionFileInfo(projectPath, agentSessionId, resolvedBaseagent, resolvedAgentAid);
         const name = fileInfo.title || `CLI会话-${new Date().toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })}`;
         // Derive selfAID and channelType from existing sessions
         const existingDir = this.findExistingChatDir(channel, channelId);
@@ -1750,7 +1785,7 @@ export class SessionManager {
             selfAID,
             projectPath,
             threadId: '',
-            baseagent,
+            baseagent: resolvedBaseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,
             agentSessionId,
@@ -1767,6 +1802,7 @@ export class SessionManager {
             channelId,
             projectPath,
             name,
+            baseagent: session.baseagent,
             timestamp: Date.now(),
         });
         return session;

package/dist/core/session/session-renew.js

@@ -191,6 +191,7 @@ export class SessionRenewService {
             ? await this.sessionManager.createRenewedSession(request.session, {
                 source,
                 causation: request.causation,
+                baseagent: request.currentBaseagent,
             })
             : request.session;
         selected.identity = request.session.identity;