evolcore 0.0.21 → 0.0.23

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

@@ -828,6 +828,7 @@ export class SessionManager {
         }
         // Create new session
         const sessionMetadata = { ...(metadata || {}) };
+        sessionMetadata.__sessionCreatedAt = Date.now();
         const newIdentity = identity ?? this.resolveIdentity(channel, userId, chatType, identityConversationId);
         const resolvedBaseagent = baseagent || 'claude';
         const session = {
@@ -1111,6 +1112,33 @@ export class SessionManager {
         }
         return 'legacy_updated';
     }
+    /**
+     * Clear a main-session backend only when the durable latest snapshot still
+     * points at the caller's expected ID. This is the recovery counterpart to
+     * provider-side "session not found" errors and must never rotate a topic.
+     */
+    async clearMainSessionBackendIfMatches(sessionId, expectedAgentSessionId, metadataKeys = []) {
+        const loaded = this.loadSessionForUpdate(sessionId);
+        if (!loaded)
+            return 'missing';
+        const { current } = loaded;
+        if (current.threadId)
+            return 'topic';
+        const currentId = normalizeBackendSessionId(current.agentSessionId);
+        if (!currentId)
+            return 'already_clear';
+        if (currentId !== normalizeBackendSessionId(expectedAgentSessionId))
+            return 'mismatch';
+        current.agentSessionId = undefined;
+        if (metadataKeys.length > 0 && current.metadata) {
+            const metadata = { ...current.metadata };
+            for (const key of metadataKeys)
+                delete metadata[key];
+            current.metadata = metadata;
+        }
+        this.persistSession(current, 'sync');
+        return 'cleared';
+    }
     async switchAgent(channel, channelId, projectPath, newBaseagent) {
         const inheritedChatType = this.getActiveChatType(channel, channelId);
         const identity = this.deriveChannelIdentity(channel, channelId);
@@ -1424,6 +1452,7 @@ export class SessionManager {
             throw new Error(`[SessionManager] createNewSession: baseagent is empty for channel=${channel} channelId=${channelId}`);
         }
         const metadata = newSessionStableMetadata(inheritedChatType, activeMetadata, identityMetadata);
+        metadata.__sessionCreatedAt = Date.now();
         if (identityMetadata?.sessionBoundaryOperationId) {
             metadata.sessionBoundaryOperationId = identityMetadata.sessionBoundaryOperationId;
         }
@@ -1586,6 +1615,7 @@ export class SessionManager {
         delete metadata.agentSessions;
         delete metadata.resumeAt;
         delete metadata.replyContext;
+        metadata.__sessionRenewedAt = Date.now();
         const session = {
             id: generateSessionId(),
             channel: sourceSession.channel,

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

@@ -13,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]/;
@@ -91,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);
@@ -121,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);
         }

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);
         }

package/dist/index.js

@@ -45,7 +45,7 @@ import { ResponseEngine } from './core/message/response-engine.js';
 import { MessageQueue } from './core/message/message-queue.js';
 import { MessageBridge } from './core/message/message-bridge.js';
 import { evaluateOutboundContactAdmission } from './core/message/message-admission.js';
-import { evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived } from './core/command/menu-protocol.js';
+import { enforceMenuResponseSize, evaluateMenuClientCompatibility, evolMenuResponseTransportMetadata, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, normalizeMenuResponseTiming, parseMenuControl, validateMenuRequest, withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived } from './core/command/menu-protocol.js';
 import { readInstalledEvolcoreVersion } from './utils/evolcore-version.js';
 import { recoverAllRoleMutationsSync } from './core/command/role-menu.js';
 import { HandoffRuntime } from './core/handoff/runtime.js';
@@ -74,7 +74,7 @@ import { AgentReloadBusyError, AgentReloadCoordinator } from './core/agent-reloa
 import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
-import { fetchEcwebPairCode } from './utils/ecweb-utils.js';
+import { remoteAccessService } from './core/auth/remote-access-store.js';
 import { createEcwebSupervisor } from './utils/ecweb-supervisor.js';
 import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
 import { detectDuplicates } from './core/evolagent-registry.js';
@@ -88,12 +88,12 @@ import { TriggerFeedbackDispatcher } from './trigger/feedback.js';
 import { TriggerRuntimeScheduler } from './trigger/scheduler.js';
 import { TargetSessionLockRegistry } from './trigger/session-lock.js';
 import { DaemonChannel } from './channels/daemon.js';
-import { definitionRevision, normalizeTriggerDefinition } from './trigger/validation.js';
+import { definitionRevision, normalizeTriggerDefinition, splitScriptCommand } from './trigger/validation.js';
 import { applyTriggerPatch } from './trigger/patch.js';
 import { validateModelSelectionForRole } from './core/model/model-permission.js';
 import { constrainRuntimePermissionMode, validateRuntimeStringFieldOverride, } from './core/role/runtime-policy.js';
 import { atomicWriteJson } from './core/session/session-fs-store.js';
-import { ensureProcessManagedTempDir } from './cli/task-context.js';
+import { DAEMON_RUNTIME_EPOCH_ENV, ensureProcessManagedTempDir } from './cli/task-context.js';
 import { appendMessageLog, buildOutboundEntry, classifyAunPayloadForLog } from './core/message/message-log.js';
 import { normalizeAunMentionEntries } from './aun/msg/mention-schema.js';
 import { MAIN_PACKAGE_NAME } from './product.js';
@@ -551,6 +551,7 @@ async function runBindBootstrapDaemon(daemonCfg) {
         })(),
     }));
     ipcServer.setControlToken(controlToken);
+    ipcServer.setRemoteAccessService(remoteAccessService);
     ipcServer.setShutdownExecutor(async (reason) => {
         if (!shutdown) {
             pendingShutdownReason = reason;
@@ -1211,6 +1212,9 @@ async function main() {
         : null;
     bindService?.startCleanup();
     const agentDelegationRegistry = new AgentDelegationRegistry();
+    // Replace any inherited marker from a parent/previous daemon before child
+    // runners or in-process IPC clients are created.
+    process.env[DAEMON_RUNTIME_EPOCH_ENV] = agentDelegationRegistry.getRuntimeEpoch();
     // 创建命令处理器
     const cmdHandler = new CommandHandler(sessionManager, agentMap, messageCache, eventBus, primaryRunnerKey);
     let agentApplicationService;
@@ -1351,6 +1355,7 @@ async function main() {
         baseagent: primaryAgent?.baseagent || 'codex',
         projectPath: primaryAgent?.projectPath || process.cwd(),
     };
+    cmdHandler.setDaemonTriggerOwner(daemonTriggerOwner.aid, daemonChannel.channelName);
     const triggerBaseagentsForAgent = (agentAid) => {
         const ownerName = agentRegistry.get(agentAid)?.name
             ?? (agentAid === daemonTriggerOwner.aid ? primaryAgent?.name : undefined);
@@ -2305,6 +2310,8 @@ async function main() {
             return { ok: false, code: delegation.code, error: delegation.reason };
         return cmdHandler.handleCtl(cmd, sessionId, delegation.grant);
     });
+    ipcServer.setDaemonRuntimeEpoch(agentDelegationRegistry.getRuntimeEpoch());
+    cmdHandler.setDaemonMonitorProvider(() => ipcServer.getMonitorSnapshot().snapshot);
     // Register every IPC executor/provider before exposing the endpoint. The
     // function declaration is hoisted, while its invocation remains here so a
     // failed bind still aborts before any AUN connection is attempted.
@@ -2374,10 +2381,10 @@ async function main() {
         catch (e) {
             logger.warn(`控制 AID 首连失败（后台自动重连，不影响 daemon 主流程）: ${e?.message || e}`);
         }
-        // 控制 AID 接收 owner 指令：
-        // 1. /pair — ECWeb 配对码（文本快路径）
+        // 控制 AID 接收 daemon-owner 或有效远程访问 token 授权的指令：
+        // 1. /pair — daemon 远程控制配对码（文本快路径）
         // 2. menu.* JSON — 路由到 cmdHandler.execMenuForControl（进程级 + 全量权限）
-        // 发送方身份由 AUN X.509 证书链验证，非 owner 完全静默。
+        // 发送方身份由 AUN X.509 证书链验证；非 Menu 文本仍只接受 daemon-owner。
         controlChannel.onMessage(async (opts) => {
             let activeMenuRequest;
             let menuCompletionLogged = false;
@@ -2385,6 +2392,11 @@ async function main() {
                 source: 'control-aun',
                 selfAid: daemonCfg.aid,
                 messageId: opts.messageId,
+                requesterAid: opts.peerId,
+                authMethod: opts.protectedHeaders?.auth_method === 'remote-access-token' || opts.protectedHeaders?.auth_method === 'ecweb-token'
+                    ? opts.protectedHeaders.auth_method
+                    : 'daemon-owner',
+                clientName: opts.protectedHeaders?.client_name ?? 'evol',
             };
             try {
                 const menuTiming = normalizeMenuResponseTiming(opts);
@@ -2398,7 +2410,7 @@ async function main() {
                 }
                 const menuResponseContext = () => controlReplyContext(opts, evolMenuResponseTransportMetadata());
                 const sendControlMenuResponse = async (response) => {
-                    const timedResponse = withMenuProcessingTime(response, menuTiming);
+                    const timedResponse = withMenuProcessingTime(enforceMenuResponseSize(response, 128 * 1024 - 1024), menuTiming);
                     const request = activeMenuRequest ?? {
                         type: 'menu.unknown',
                         id: response.id,
@@ -2446,7 +2458,21 @@ async function main() {
                     menuCompletionLogged = true;
                     return;
                 }
-                if (menuControl.isMenu && !isRoleMenu && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
+                const menuClientCompatibilityError = menuControl.isMenu
+                    ? evaluateMenuClientCompatibility({ encrypted: opts.encrypted, protectedHeaders: opts.protectedHeaders })
+                    : null;
+                if (menuControl.isMenu && menuClientCompatibilityError) {
+                    await sendControlMenuResponse(menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, menuClientCompatibilityError));
+                    return;
+                }
+                const protectedMenuHeaders = opts.protectedHeaders;
+                const hasRemoteAccessToken = protectedMenuHeaders?.auth_method === 'remote-access-token'
+                    || protectedMenuHeaders?.auth_method === 'ecweb-token';
+                if (text.toLowerCase() === '/pair' && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
+                    logger.debug(`控制 AID 收到非 owner 配对请求，忽略: from=${opts.peerId}`);
+                    return;
+                }
+                if (menuControl.isMenu && !isRoleMenu && !hasRemoteAccessToken && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
                     const response = menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, {
                         code: 'NOT_ALLOWED',
                         message: formatAuthorizationDenial('Control-channel process operations require DaemonOwner.', 'DAEMON_OWNER_REQUIRED'),
@@ -2455,40 +2481,28 @@ async function main() {
                     await sendControlMenuResponse(response);
                     return;
                 }
-                if (!isRoleMenu && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
+                if (!isRoleMenu && !hasRemoteAccessToken && !isProcessLevelOwner(opts.peerId, currentProcessOwners)) {
                     logger.debug(`控制 AID 收到非 owner 消息，忽略: from=${opts.peerId}`);
                     return;
                 }
                 if (text.toLowerCase() === '/pair') {
-                    const port = ecwebService(loadDaemonConfig().services)?.port ?? DEFAULT_ECWEB_PORT;
-                    const pair = await fetchEcwebPairCode(port, opts.peerId);
-                    let reply;
-                    if (pair) {
-                        const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
-                        reply = `ECWeb 配对码：${pair.code}（约 ${mins} 分钟内有效）\n在浏览器打开 ECWeb 后输入此码登录`;
-                    }
-                    else {
-                        reply = 'ECWeb 未运行或暂不可达。请在主机运行 ec watch web 启动后重试。';
-                    }
+                    const pair = remoteAccessService.getPairingCode(opts.peerId);
+                    const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
+                    const reply = `远程控制配对码：${pair.code}（约 ${mins} 分钟内有效）`;
                     await controlChannel.sendMessage(opts.channelId, reply, controlReplyContext(opts));
                     return;
                 }
-                // menu.* JSON 路由：owner 已在上方校验，转交 execMenuForControl（fromControlChannel=true）
+                // menu.* JSON 路由：准入来源在上方分流，最终 token/owner 校验由 execMenuForControl 完成。
                 if (menuControl.isMenu) {
-                    const versionError = evaluateEvolMenuVersionGate({
-                        encrypted: opts.encrypted,
-                        protectedHeaders: opts.protectedHeaders,
-                    });
-                    if (versionError) {
-                        await sendControlMenuResponse(menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, versionError));
-                        return;
-                    }
                     const validationError = validateMenuRequest(menuControl.request);
                     if (validationError) {
                         await sendControlMenuResponse(menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, validationError));
                         return;
                     }
-                    const deduped = await controlMenuDeduper.execute([opts.channelId, opts.peerId, menuControl.id].join('\u001f'), menuPayloadFingerprint(menuControl.raw), () => cmdHandler.execMenuForControl(parsed, opts.peerId));
+                    const deduped = await controlMenuDeduper.execute([opts.channelId, opts.peerId, menuControl.id].join('\u001f'), menuPayloadFingerprint(menuControl.raw), () => cmdHandler.execMenuForControl(parsed, opts.peerId, {
+                        encrypted: opts.encrypted,
+                        protectedHeaders: opts.protectedHeaders,
+                    }));
                     if ('retry' in deduped) {
                         if (deduped.replayed) {
                             logger.warn(`[MenuControl] category=request-replay request=${menuControl.id}`
@@ -2508,7 +2522,7 @@ async function main() {
                     return;
                 }
                 // owner 发的其他内容：提示可用指令
-                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取 ECWeb 登录配对码）', controlReplyContext(opts));
+                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取远程控制配对码）', controlReplyContext(opts));
             }
             catch (e) {
                 if (activeMenuRequest && !menuCompletionLogged) {
@@ -2684,6 +2698,7 @@ async function main() {
         // M3: direct call (not cast) — wire EvolAgentRegistry into IPC for evolagent.* handlers
         ipcServer.setAgentRegistry(agentRegistry);
         ipcServer.setControlToken(triggerControlToken);
+        ipcServer.setRemoteAccessService(remoteAccessService);
         ipcServer.setBootstrapCompleteExecutor(async (aid, auth) => {
             if (auth?.sessionId) {
                 const authorization = await authorizeManagedAgentOperation({
@@ -2836,7 +2851,7 @@ async function main() {
             for (const runner of new Set(agentMap.values())) {
                 if (typeof runner?.evaluatePreToolUse !== 'function')
                     continue;
-                const result = await runner.evaluatePreToolUse(params.threadId, params.toolName, params.toolInput, params.signal);
+                const result = await runner.evaluatePreToolUse(params.threadId, params.toolName, params.toolInput, params.signal, params.callId);
                 if (result.applicable)
                     return result;
             }
@@ -4003,17 +4018,59 @@ async function main() {
                     const existing = schedulerFor(agentAid).list({ all: true }).find(trigger => trigger.id === cmd.triggerId);
                     if (!existing)
                         throw new Error(`trigger not found: ${cmd.triggerId}`);
+                    const rawPatch = cmd.patch && typeof cmd.patch === 'object' && !Array.isArray(cmd.patch)
+                        ? cmd.patch
+                        : {};
+                    const rawScriptFile = rawPatch.scriptFile;
+                    if (rawScriptFile !== undefined && rawScriptFile !== true) {
+                        throw new Error('scriptFile must be true');
+                    }
+                    const patchScriptFile = rawScriptFile === true;
+                    const { scriptFile: _scriptFile, ...definitionPatch } = rawPatch;
+                    const scriptFileBase64 = cmd.scriptFileBase64;
+                    if (patchScriptFile && scriptFileBase64 === undefined) {
+                        throw new Error('--script-file requires scriptFileBase64');
+                    }
+                    if (!patchScriptFile && scriptFileBase64 !== undefined) {
+                        throw new Error('scriptFileBase64 requires --script-file');
+                    }
+                    if (scriptFileBase64 !== undefined) {
+                        if (typeof scriptFileBase64 !== 'string') {
+                            throw new Error('scriptFileBase64 must be a base64 string');
+                        }
+                        if (!actor.daemonPrivileged) {
+                            throw new Error('updating a script Trigger requires DaemonOwner');
+                        }
+                        if (existing.execution.type !== 'script' || !existing.execution.script) {
+                            throw new Error('--script-file only applies to script Triggers');
+                        }
+                        if (scriptFileBase64.length > 6 * 1024 * 1024
+                            || !/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(scriptFileBase64)) {
+                            throw new Error('scriptFileBase64 is invalid or exceeds the 4 MiB limit');
+                        }
+                        const scriptBytes = Buffer.from(scriptFileBase64, 'base64');
+                        if (scriptBytes.length > 4 * 1024 * 1024)
+                            throw new Error('script file exceeds the 4 MiB limit');
+                    }
                     const currentRevision = definitionRevision(existing);
                     if (cmd.expectedRevision !== undefined && cmd.expectedRevision !== currentRevision) {
                         throw new Error(`trigger revision conflict: expected ${cmd.expectedRevision}, current ${currentRevision}`);
                     }
-                    let definition = applyTriggerPatch(existing, cmd.patch, { fromPromptFile: cmd.promptFile === true });
+                    let definition = Object.keys(definitionPatch).length > 0
+                        ? applyTriggerPatch(existing, definitionPatch, { fromPromptFile: cmd.promptFile === true })
+                        : existing;
                     rejectUnapprovedFullAccessConfiguration(definition, actor);
                     definition = withFullAccessConfigurationProvenance(definition, actor);
                     validateTriggerDefinitionForActor(definition, actor);
                     validateTriggerFeedbackChannels(definition);
                     const scheduler = schedulerFor(agentAid);
-                    const trigger = scheduler.update(cmd.triggerId, definition);
+                    const files = scriptFileBase64 !== undefined && existing.execution.script
+                        ? [{
+                                relativePath: splitScriptCommand(existing.execution.script.path).path,
+                                contentBase64: scriptFileBase64,
+                            }]
+                        : [];
+                    const trigger = scheduler.update(cmd.triggerId, definition, files);
                     if (trigger.execution.permissionMode === 'fullaccess') {
                         auditFullAccessTriggerConfiguration('fullaccess.trigger.configured', trigger, actor, existing.execution.permissionMode === 'fullaccess'
                             ? 'fullaccess Trigger updated through IPC'
@@ -4152,6 +4209,19 @@ async function main() {
                 await Promise.all([...triggerSchedulers.values()].map(scheduler => scheduler.suspendForDaemonExit()));
             });
             await shutdownStep('interrupt active message queue tasks', async () => { await queueShutdown; });
+            await shutdownStep('dispose agent runners', async () => {
+                const currentInstances = [...agentMap.entries()].map(([key, agent]) => {
+                    const split = key.lastIndexOf('::');
+                    return {
+                        evolagentName: split > 0 ? key.slice(0, split) : '<unknown>',
+                        baseagent: split > 0 ? key.slice(split + 2) : 'unknown',
+                        agent,
+                    };
+                });
+                await disposeAgentInstances(currentInstances, (instance, error) => {
+                    logger.warn(`[Shutdown] Failed to dispose runner ${instance.evolagentName}::${instance.baseagent}: ${error instanceof Error ? error.message : String(error)}`);
+                });
+            });
             eventBus.publish({
                 type: 'system:shutdown',
                 timestamp: Date.now()