evolcore 0.0.32 → 0.0.33

package/dist/core/thread/types.js

@@ -0,0 +1 @@
+export {};

package/dist/eck/message-renderer.js

@@ -50,6 +50,8 @@ function renderOneItem(item, sessionVars, sessionCache, contentSentinel) {
     };
     const isOwnerHint = item.kind === 'owner-hint';
     const isHandoff = item.kind === 'handoff';
+    const isThreadContext = item.kind === 'thread-context';
+    const isTriggerMsg = item.kind === 'trigger';
     const handoffPreviousSentinel = `\x00ECMSG-HANDOFF-PREV-${randomUUID()}\x00`;
     const requiredReplacements = (item.handoff?.requiredEntries ?? []).map(entry => ({
         entry,
@@ -131,6 +133,39 @@ function renderOneItem(item, sessionVars, sessionCache, contentSentinel) {
         injectTime: isOwnerHint
             ? formatLocalTime(item.injectTime ?? item.timestamp ?? Date.now(), sessionVars.timezone ? String(sessionVars.timezone) : undefined)
             : undefined,
+        // T4: 跨会话上下文（thread-inbox 注入）
+        isThreadContext,
+        threadContextOriginThreadId: item.threadContext?.originThreadId,
+        threadContextOriginPeer: item.threadContext?.originPeer,
+        threadContextTime: item.timestamp !== undefined
+            ? formatLocalTime(item.timestamp, sessionVars.timezone ? String(sessionVars.timezone) : undefined)
+            : undefined,
+        threadContextGapHasNewMessages: item.threadContext?.gapDetection.hasNewMessages === true,
+        threadContextGapCount: item.threadContext?.gapDetection.count,
+        // M1: 空洞检测失败（来源话题的 messages.jsonl 缺失/损坏）时，gapDetection 保守返回
+        // hasNewMessages=false，与"确实无新消息"渲染结果相同。透出 error 让模板提示"无法检测"，
+        // 避免 agent 把检测失败误读成"来源话题无更新"。
+        threadContextGapError: item.threadContext?.gapDetection.error,
+        threadContextGapRange: (() => {
+            const g = item.threadContext?.gapDetection;
+            if (!g?.hasNewMessages || g.firstTimestamp === undefined || g.lastTimestamp === undefined)
+                return undefined;
+            const tz = sessionVars.timezone ? String(sessionVars.timezone) : undefined;
+            return `${formatLocalTime(g.firstTimestamp, tz)} - ${formatLocalTime(g.lastTimestamp, tz)}`;
+        })(),
+        threadContextTriggerId: item.threadContext?.triggerId,
+        // T9: trigger 消息专属信封变量
+        isTriggerMsg,
+        triggerMsgId: isTriggerMsg ? item.triggerInfo?.triggerId : undefined,
+        triggerMsgName: isTriggerMsg ? item.triggerInfo?.triggerName : undefined,
+        triggerMsgFireTime: isTriggerMsg && item.triggerInfo?.fireTime !== undefined
+            ? formatLocalTime(item.triggerInfo.fireTime, sessionVars.timezone ? String(sessionVars.timezone) : undefined)
+            : undefined,
+        // T10: labels 路由 key（默认 'default'）+ 动态展开 triggerMsgLabel_<key>
+        triggerMsgKind: isTriggerMsg ? (item.triggerInfo?.labels?.kind ?? 'default') : undefined,
+        ...(isTriggerMsg && item.triggerInfo?.labels
+            ? Object.fromEntries(Object.entries(item.triggerInfo.labels).map(([k, v]) => [`triggerMsgLabel_${k}`, v]))
+            : {}),
         // msg send 跨会话一次性上下文
         isHandoff,
         handoffKind: item.handoff?.kind,

package/dist/index.js

@@ -22,7 +22,7 @@ import { createSessionIdentityResolver } from './config/peer-role-resolver.js';
 import { initializeStartupConfig, prepareStartupConfig, recordStartupConfig } from './config/boot-log.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
 import { SessionManager } from './core/session/session-manager.js';
-import { SessionIdleMonitor, readRelationSessionIdleSeconds } from './core/session/session-idle-monitor.js';
+import { SessionIdleMonitor, readSessionLoopIdleSeconds } from './core/session/session-idle-monitor.js';
 import { ClaudeAgentPlugin } from './agents/claude-runner.js';
 import { CodexAgentPlugin } from './agents/codex-runner.js';
 import { GeminiAgentPlugin } from './agents/gemini-runner.js';
@@ -426,13 +426,15 @@ async function main() {
         getSessionById: sessionId => sessionManager.getSessionById(sessionId),
         isSessionBusy: sessionId => messageQueue.isProcessing(sessionId) || messageQueue.getQueueLength(sessionId) > 0,
         getSessionIdleTriggerIds: () => triggerSchedulers.sessionIdleTriggerIds(),
-        getSessionIdleSeconds: readRelationSessionIdleSeconds,
+        getSessionIdleSeconds: readSessionLoopIdleSeconds,
         getSessionEncrypt: sessionId => sessionManager.getSessionEncrypt(sessionId),
+        isCurrentMainSession: session => sessionManager.getActiveSessionSync(session.channel, session.channelId)?.id === session.id,
     });
     sessionIdleMonitor.start();
     onConfigWrite(({ target, selector }) => {
-        if (target === ConfigTarget.Relation && selector.self)
-            sessionIdleMonitor.refresh();
+        if (target === ConfigTarget.Relation && selector.self && selector.peerKey) {
+            void sessionIdleMonitor.refreshRelation(selector.self, selector.peerKey);
+        }
     });
     onShutdown(() => sessionIdleMonitor.stop());
     const targetSessionLocks = new TargetSessionLockRegistry();
@@ -490,10 +492,11 @@ async function main() {
         sessionManager,
         getAgent: aid => agentRegistry.get(aid),
         agentMap,
-        releaseSlot: aid => consolidationQueue.release(aid),
+        releaseSlot: (aid, sessionId) => consolidationQueue.release(aid, sessionId),
         enqueueConsolidation,
         sendFeedback: sendConsolidationFeedback,
     });
+    consolidationQueue.setFinalizer(finishConsolidationSession);
     registerConsolidationSessionEvents({
         eventBus,
         permissionGateway,

package/dist/ipc.js

@@ -17,6 +17,7 @@ import { getProcessStartTime, isSameOrOlderProcess } from './utils/process-intro
 import { classifyProcessTree, ProcessTreeSampler, readProcessMetrics } from './utils/process-tree-stats.js';
 import { readSystemMemoryUsage } from './utils/system-memory.js';
 import { hashCurrentDelegatedCommand, hashDelegatedCommandArgv } from './core/auth/agent-delegation.js';
+import { resolveSkillRefreshArgv } from './core/skill/command-parser.js';
 import { normalizeAunMentionEntries } from './aun/msg/mention-schema.js';
 import { remoteAccessService } from './core/auth/remote-access-store.js';
 import { setModelCatalogDaemonOwner } from './core/model/model-catalog.js';
@@ -83,7 +84,7 @@ const MEMORY_COMMAND_ENDPOINTS = new Set([
 const DELEGATED_ARGV_ENDPOINTS = new Set([
     'agent.op', 'config.op', 'contact.op', 'aid.op', 'group.op', 'msg.op', 'fs.op',
     'ctl', 'diag', 'menu-client.request', 'task.resume', 'queue.op', 'storage.auth', 'storage.upload',
-    'trigger.op', 'local-command-context', 'evolagent.bootstrapComplete', ...MEMORY_COMMAND_ENDPOINTS,
+    'trigger.op', 'skill.refresh', 'thread.op', 'local-command-context', 'evolagent.bootstrapComplete', ...MEMORY_COMMAND_ENDPOINTS,
     'handoff-return', 'handoff-recover-return', 'handoff-status', 'handoff-list', 'handoff-trace',
 ]);
 let ipcQuerySequence = 0;
@@ -105,9 +106,17 @@ function nextIpcQueryId(cmd) {
 function requiresLocalControlToken(cmd) {
     // Managed calls use task delegation. Standalone queries must not gain
     // management scope merely by omitting (or emptying) sessionId.
-    return cmd.type === 'evolagent.initialize' || LOCAL_CONTROL_COMMANDS.has(String(cmd.type ?? ''))
-        || (['evolagent.bootstrapComplete', 'diag', 'handoff-status', 'handoff-list', 'handoff-trace', 'task.resume'].includes(String(cmd.type))
-            && !(typeof cmd.sessionId === 'string' && cmd.sessionId.trim()));
+    const type = String(cmd.type ?? '');
+    const sessionId = typeof cmd.sessionId === 'string' && cmd.sessionId.trim();
+    const delegated = typeof cmd.delegationToken === 'string' && cmd.delegationToken.trim();
+    if (cmd.type === 'evolagent.initialize' || LOCAL_CONTROL_COMMANDS.has(type))
+        return true;
+    if (type === 'debug-issue-token')
+        return true;
+    if (type === 'skill.refresh' || type === 'thread.op')
+        return !sessionId || !delegated;
+    return ['evolagent.bootstrapComplete', 'diag', 'handoff-status', 'handoff-list', 'handoff-trace', 'task.resume'].includes(type)
+        && !sessionId;
 }
 /** Preserve the pipe DACL and grant only the provisioned Codex users data I/O. */
 function grantWindowsSandboxPipeAccess(endpoint) {
@@ -164,6 +173,7 @@ export class IpcServer {
     aunAidStatsRecorder;
     menuExecutor;
     agentOperationExecutor;
+    skillRefreshExecutor;
     initializationExecutor;
     statsProvider;
     agentStatsProvider;
@@ -182,6 +192,7 @@ export class IpcServer {
     shutdownExecutor;
     taskRuntimeContextProvider;
     debugTaskRuntimeContextProvider;
+    debugIssueTokenExecutor;
     taskRuntimeContextAuthorizer;
     codexPreToolUseExecutor;
     aunMsgSender;
@@ -199,6 +210,7 @@ export class IpcServer {
     groupOperationExecutor;
     msgOperationExecutor;
     fsOperationExecutor;
+    threadOperationExecutor;
     dingtalkContactBindExecutor;
     feishuContactBindExecutor;
     qqbotContactBindExecutor;
@@ -286,6 +298,9 @@ export class IpcServer {
     setAgentOperationExecutor(executor) {
         this.agentOperationExecutor = executor;
     }
+    setSkillRefreshExecutor(executor) {
+        this.skillRefreshExecutor = executor;
+    }
     setConfigOperationExecutor(executor) {
         this.configOperationExecutor = executor;
     }
@@ -304,6 +319,9 @@ export class IpcServer {
     setFsOperationExecutor(executor) {
         this.fsOperationExecutor = executor;
     }
+    setThreadOperationExecutor(executor) {
+        this.threadOperationExecutor = executor;
+    }
     setAgentReloadExecutor(executor) {
         this.agentReloadExecutor = executor;
     }
@@ -439,7 +457,7 @@ export class IpcServer {
     setTriggerExecutor(executor) {
         this.triggerExecutor = executor;
     }
-    /** Inject daemon-level consolidation launcher that uses the real trigger scheduler. */
+    /** Inject daemon-level consolidation launcher (BackgroundSessionLauncher, via executor closure). */
     setConsolidationLaunchExecutor(executor) {
         this.consolidationLaunchExecutor = executor;
     }
@@ -455,15 +473,17 @@ export class IpcServer {
     setTaskRuntimeContextProvider(provider) {
         this.taskRuntimeContextProvider = provider;
     }
-    /** 仅开发仓（npm link）安装注册；正式安装不调用，debug 请求一律走正常路径。 */
     setDebugTaskRuntimeContextProvider(provider) {
         this.debugTaskRuntimeContextProvider = provider;
     }
+    /** debug 模式：注册 debug-issue-token executor，仅 EVOLCORE_DEBUG_MODE=1 时由 index.ts 调用。 */
+    setDebugIssueTokenExecutor(executor) {
+        this.debugIssueTokenExecutor = executor;
+    }
     /**
-     * memory 命令取运行时上下文：先查正在运行的任务；没有且请求带 debug 时，
-     * 再由开发仓专用的 provider 从会话文件重建。
+     * memory 命令取运行时上下文：查正在运行的任务。
      */
-    async resolveMemoryTaskCtx(sessionId, debug) {
+    async resolveMemoryTaskCtx(sessionId, debug = false) {
         const active = this.taskRuntimeContextProvider?.({ sessionId });
         if (active || !debug || !this.debugTaskRuntimeContextProvider)
             return active;
@@ -479,6 +499,14 @@ export class IpcServer {
     setAunMsgSender(sender) {
         this.aunMsgSender = sender;
     }
+    hasAunMsgSender() {
+        return this.aunMsgSender !== undefined;
+    }
+    async sendAunMsg(params) {
+        if (!this.aunMsgSender)
+            throw new Error('aunMsgSender not configured');
+        return this.aunMsgSender(params);
+    }
     setDiagExecutor(executor) { this.diagExecutor = executor; }
     setMenuClientExecutor(executor) { this.menuClientExecutor = executor; }
     /** Inject internal handoff result return executor for `ec handoff return`. */
@@ -928,6 +956,7 @@ export class IpcServer {
         }
         if (typeof cmd.delegationToken === 'string' && cmd.delegationToken
             && this.daemonRuntimeEpoch
+            && cmd.daemonRuntimeEpoch !== undefined
             && cmd.daemonRuntimeEpoch !== this.daemonRuntimeEpoch) {
             logger.warn(`[IPC] stale delegation rejected: session=${ipcLogToken(cmd.sessionId ?? cmd.originSessionId ?? cmd.actorSessionId)} type=${ipcLogToken(cmd.type)} cause=daemon_runtime_epoch_mismatch`);
             return {
@@ -1385,12 +1414,25 @@ export class IpcServer {
                     sessionId: cmd.sessionId,
                     delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
                     delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
+                    consumeApproval: false,
                 });
                 if (!authorization.ok)
                     return authorization;
                 const context = this.taskRuntimeContextProvider({ sessionId: cmd.sessionId }) ?? null;
                 return { ok: true, context };
             }
+            case 'debug-issue-token': {
+                if (cmd.delegationToken)
+                    return { ok: false, code: 'NOT_ALLOWED', error: 'Managed tasks cannot issue debug tokens' };
+                // 仅 EVOLCORE_DEBUG_MODE=1 时由 index.ts 注册 executor；非 debug 模式直接拒绝
+                if (!this.debugIssueTokenExecutor) {
+                    return { ok: false, error: 'debug mode is not enabled; start daemon with: ec start --debug' };
+                }
+                if (typeof cmd.sessionId !== 'string' || !/^[A-Za-z0-9][A-Za-z0-9_.-]*$/.test(cmd.sessionId)) {
+                    return { ok: false, error: 'missing sessionId' };
+                }
+                return this.debugIssueTokenExecutor({ sessionId: cmd.sessionId });
+            }
             case 'aun-msg-send': {
                 if (cmd.argv !== undefined) {
                     if (!this.aunMsgSender)
@@ -1458,7 +1500,6 @@ export class IpcServer {
                             : undefined,
                         encrypt: typeof cmd.encrypt === 'boolean' ? cmd.encrypt : undefined,
                         thread: typeof cmd.thread === 'string' ? cmd.thread : undefined,
-                        returnPolicy: cmd.returnPolicy === 'required' || cmd.returnPolicy === 'none' ? cmd.returnPolicy : undefined,
                         handoffContext: cmd.handoffContext,
                         originSessionId: typeof cmd.originSessionId === 'string' ? cmd.originSessionId : undefined,
                         originMessageId: typeof cmd.originMessageId === 'string' ? cmd.originMessageId : undefined,
@@ -1704,6 +1745,7 @@ export class IpcServer {
                         contextFilePath: r.contextFilePath,
                         ...(r.logFile ? { logFile: r.logFile } : {}),
                         mode: effectiveMode,
+                        ...(r.queued ? { queued: r.queued } : {}),
                     };
                 }
                 catch (e) {
@@ -1972,6 +2014,16 @@ export class IpcServer {
                 }
                 return await this.fsOperationExecutor(argv, sessionId, delegationToken, typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined);
             }
+            case 'thread.op': {
+                if (!this.threadOperationExecutor)
+                    return { ok: false, code: 'NOT_CONFIGURED', error: 'thread.op not configured' };
+                const delegated = typeof cmd.delegationToken === 'string' && cmd.delegationToken.trim();
+                const req = {
+                    ...cmd,
+                    localControl: !delegated && this.hasValidControlToken(cmd.controlToken),
+                };
+                return await this.threadOperationExecutor(req);
+            }
             case 'evolagent.initialize': {
                 if (cmd.sessionId || cmd.delegationToken)
                     return { ok: false, code: 'NOT_ALLOWED', error: 'Managed callers must use agent.op' };
@@ -1991,6 +2043,33 @@ export class IpcServer {
                 }
                 return await this.agentOperationExecutor(argv, sessionId, delegationToken, typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined);
             }
+            case 'skill.refresh': {
+                if (!this.skillRefreshExecutor) {
+                    return { ok: false, code: 'NOT_CONFIGURED', error: 'skill.refresh not configured' };
+                }
+                let { aid } = cmd;
+                const { sessionId, delegationToken } = cmd;
+                if (typeof aid !== 'string' || !aid) {
+                    return { ok: false, code: 'INVALID_REQUEST', error: 'missing aid' };
+                }
+                if (sessionId !== undefined && typeof sessionId !== 'string') {
+                    return { ok: false, code: 'INVALID_REQUEST', error: 'sessionId must be a string' };
+                }
+                if (delegationToken !== undefined && typeof delegationToken !== 'string') {
+                    return { ok: false, code: 'INVALID_DELEGATION', error: 'delegationToken must be a string' };
+                }
+                if (sessionId && !delegationToken)
+                    return { ok: false, code: 'DELEGATION_REQUIRED', error: 'Managed skill refresh requires delegation' };
+                try {
+                    if (!Array.isArray(cmd.argv))
+                        throw new Error('Skill refresh requires argv');
+                    aid = resolveSkillRefreshArgv(cmd.argv);
+                }
+                catch (error) {
+                    return { ok: false, code: 'INVALID_REQUEST', error: error instanceof Error ? error.message : String(error) };
+                }
+                return await this.skillRefreshExecutor(aid, sessionId, delegationToken, typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined);
+            }
             case 'trigger.op':
             case 'trigger.list':
             case 'trigger.show':

package/dist/paths.js

@@ -208,6 +208,26 @@ export function channelStatePath(channelKey, ...parts) {
 export function agentTriggersDir(aid) {
     return path.join(agentDir(aid), 'triggers');
 }
+/** 话题数据的统一根目录：索引、摘要、续读锚点、跨会话收件箱都收在这里。 */
+export function agentThreadsDir(aid) {
+    return path.join(agentDataDir(aid), 'threads');
+}
+export function agentThreadIndexPath(aid) {
+    return path.join(agentThreadsDir(aid), 'index.json');
+}
+export function agentThreadSummariesDir(aid) {
+    return path.join(agentThreadsDir(aid), 'summaries');
+}
+export function agentThreadSummaryPath(aid, sessionId) {
+    return path.join(agentThreadSummariesDir(aid), `${sessionId}.summary.jsonl`);
+}
+/** Thread Context 收件箱：跨话题发送后在目标会话侧留下的注入提醒。 */
+export function agentThreadInboxDir(aid) {
+    return path.join(agentThreadsDir(aid), 'inbox');
+}
+export function agentThreadInboxPath(aid, targetSessionId) {
+    return path.join(agentThreadInboxDir(aid), `${targetSessionId}.jsonl`);
+}
 function stripTrailingWindowsSeparators(value) {
     const stripped = value.replace(/[\\/]+$/g, '');
     // Keep a drive-root separator. `C:` is a drive-relative path on Windows.
@@ -414,6 +434,9 @@ export function kitsSchemasDir() {
 export function eckDebugDir() {
     return path.join(resolveRoot(), 'data', 'eck-debug');
 }
+export function debugSessionsDir() {
+    return path.join(resolveRoot(), 'data', 'debug-sessions');
+}
 export function getPackageRoot() {
     // import.meta.dirname is available in Node.js 21.2+ and always returns
     // the correct OS-native path, regardless of Git Bash or MSYS2 environment.