evolcore 0.0.20 → 0.0.22

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

@@ -5,7 +5,6 @@ import { isTransientProtocolMessage, messageLogPath } from '../message/message-l
 import { readAllJsonlLines } from './session-fs-store.js';
 import { ResponseModeRegistry } from '../../response-system/registry.js';
 import { registerBuiltinModes } from '../../response-system/modes/index.js';
-import { resolveEffectiveResponseModeConfig } from '../../response-system/config-resolver.js';
 import { normalizeBaseagent } from '../../agents/baseagent.js';
 const DEFAULT_AFTER_HOURS = 24;
 const DEFAULT_FALLBACK = 'continue';
@@ -14,6 +13,9 @@ const MAX_CONTEXT_CHARS = 16_000;
 const MAX_MESSAGE_CHARS = 2_000;
 const MODEL_TIMEOUT_MS = 10_000;
 const RECENT_DECISION_TTL_MS = 30_000;
+const FRESH_EMPTY_SESSION_TTL_MS = 30_000;
+const RENEWED_AT_METADATA_KEY = '__sessionRenewedAt';
+const CREATED_AT_METADATA_KEY = '__sessionCreatedAt';
 const NEW_CONFIDENCE_THRESHOLD = 0.85;
 const AUXILIARY_EFFORTS = new Set(['low', 'medium', 'high', 'xhigh', 'max']);
 const EXPLICIT_NEW_RE = /^(?:新话题|换个话题|重新开始|新开会话|新会话)[：:，,；;。！!\n]/;
@@ -92,7 +94,9 @@ export class SessionRenewService {
         const routeKey = this.routeKey(request);
         return await this.withLock(routeKey, async () => {
             const cached = this.recentDecisions.get(routeKey);
-            if (cached && cached.candidateSessionId === request.session.id && cached.expiresAt > this.now()) {
+            if (cached
+                && cached.expiresAt > this.now()
+                && (cached.candidateSessionId === request.session.id || cached.selectedSessionId === request.session.id)) {
                 const selected = cached.selectedSessionId === request.session.id
                     ? request.session
                     : await this.sessionManager.getSessionById(cached.selectedSessionId);
@@ -122,6 +126,18 @@ export class SessionRenewService {
         if (!last) {
             if (request.isNewSession)
                 return { session: request.session, renewed: false };
+            // A renewed session is intentionally created before its first inbound
+            // message is appended. A concurrent message can therefore observe an
+            // empty, freshly-created session. Treat that state as already renewed;
+            // do not create a second logical session for the same route.
+            const metadata = request.session.metadata;
+            const renewedAt = Number(metadata?.[RENEWED_AT_METADATA_KEY] ?? metadata?.[CREATED_AT_METADATA_KEY]);
+            const sessionAgeMs = Number.isFinite(renewedAt)
+                ? Math.max(0, this.now() - renewedAt)
+                : Number.POSITIVE_INFINITY;
+            if (Number.isFinite(renewedAt) && renewedAt <= this.now() && sessionAgeMs <= FRESH_EMPTY_SESSION_TTL_MS) {
+                return { session: request.session, renewed: false, decision: 'continue', source: 'missing_history' };
+            }
             const idleMs = this.now() - request.session.updatedAt;
             return await this.finishDecision(routeKey, request, 'new', 'missing_history', idleMs, evaluationStartedAt);
         }
@@ -230,23 +246,31 @@ export class SessionRenewService {
         }, { cache: true, expand: true });
     }
     resolveAuxiliaryConfig(config, baseagent) {
-        const resolved = resolveEffectiveResponseModeConfig(this.responseModeRegistry, config);
-        const rawModel = resolved.modeConfig.auxiliaryModel;
         const canonicalBaseagent = normalizeBaseagent(baseagent).canonical;
-        const selectedModel = typeof rawModel === 'string'
-            ? rawModel
-            : rawModel && typeof rawModel === 'object' && !Array.isArray(rawModel)
-                ? rawModel[canonicalBaseagent]
-                : undefined;
-        const model = typeof selectedModel === 'string' && selectedModel.trim()
-            ? selectedModel.trim()
+        const baseagentConfig = canonicalBaseagent !== 'unknown'
+            ? config.baseagents?.[canonicalBaseagent]
+            : undefined;
+        const rawBaseagentConfig = baseagentConfig && typeof baseagentConfig === 'object'
+            ? baseagentConfig
+            : undefined;
+        // Auxiliary inference is owned exclusively by the selected baseagent. Old
+        // response-mode bucket values must be migrated before they can take effect.
+        const configuredMode = typeof config.responseMode === 'string' && config.responseMode.trim()
+            ? config.responseMode.trim()
+            : undefined;
+        const responseMode = configuredMode && this.responseModeRegistry.has(configuredMode)
+            ? configuredMode
+            : this.responseModeRegistry.getPreferredId() ?? 'single-session';
+        const rawModel = rawBaseagentConfig?.auxiliaryModel;
+        const rawEffort = rawBaseagentConfig?.auxiliaryEffort;
+        const model = typeof rawModel === 'string' && rawModel.trim()
+            ? rawModel.trim()
             : undefined;
-        const rawEffort = resolved.modeConfig.auxiliaryEffort;
         const effort = typeof rawEffort === 'string' && AUXILIARY_EFFORTS.has(rawEffort)
             ? rawEffort
             : undefined;
         return {
-            responseMode: resolved.mode.id,
+            responseMode,
             model,
             effort,
             invalidEffort: rawEffort !== undefined && effort === undefined,

package/dist/core/session/session-turn-coordinator.js

@@ -48,10 +48,14 @@ export class SessionTurnCoordinator {
             && state.lastTerminal.taskId === lease.taskId
             && state.lastTerminal.generation === lease.generation;
     }
-    invalidate(sessionId, reason) {
+    invalidate(sessionId, reason, expected) {
         const state = this.states.get(sessionId);
         if (!state)
             return undefined;
+        if (expected?.taskId && state.active?.taskId !== expected.taskId)
+            return undefined;
+        if (expected?.generation !== undefined && state.active?.generation !== expected.generation)
+            return undefined;
         if (state.active?.status === 'interrupting' && state.active.cancelReason === reason) {
             return cloneTurnMetadata(state);
         }
@@ -208,9 +212,16 @@ export class SessionTurnCoordinator {
         return true;
     }
     async persist(session, state) {
-        const metadata = { ...(session.metadata ?? {}), turnState: cloneTurnMetadata(state) };
-        session.metadata = metadata;
-        this.states.set(session.id, cloneTurnMetadata(state));
-        await this.sessionManager.updateSession(session.id, { metadata });
+        const next = cloneTurnMetadata(state);
+        session.metadata = { ...(session.metadata ?? {}), turnState: next };
+        this.states.set(session.id, next);
+        if (typeof this.sessionManager.updateTurnState === 'function') {
+            await this.sessionManager.updateTurnState(session.id, next);
+        }
+        else {
+            // Compatibility for minimal test doubles and pre-patch adapters. Real
+            // SessionManager instances always expose updateTurnState.
+            await this.sessionManager.updateSession(session.id, { metadata: { turnState: next } });
+        }
     }
 }

package/dist/eck/kit-renderer.js

@@ -254,7 +254,7 @@ const PARAM_DESCRIPTIONS = {
     proactiveSendTargetLabel: 'proactive 发送目标标签（对方/群里）',
     readonly: '是否只读模式',
     evolcoreMode: 'evolcore 运行模式（dev=源码仓库可直接修改 | install=全局安装包只读）',
-    baseAgent: 'base agent 规范值（claude/codex/gemini/hermes）',
+    baseAgent: 'base agent 规范值（claude/codex/gemini/ecagent）',
     baseAgentName: 'base agent 显示名',
     baseAgentModel: 'base agent 引擎底座模型（evolcore 作用域无配置时的兜底）',
     effectiveModel: '当前实际生效模型（关系级 > agent级 > 全局 优先级解析结果）',