evolcore 0.0.35 → 0.0.36

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

@@ -8,6 +8,7 @@ import { isInternalInjectedUserMessage, isToolResultMessage } from './session-tr
 import { chatDirPath, generateSessionId, formatTimestamp, atomicWriteJson, atomicWriteText, appendJsonl, appendJsonlDurable, fsyncJsonlFile, readJsonFile, readLastJsonlLine, readLastJsonlLineStrict, readAllJsonlLines, scanChatDirs, scanMetaFiles, ensureChatDir, readThreadIndex, writeThreadIndex, compactJsonlTail, SESSION_META_COMPACT_POLICY, } from './session-fs-store.js';
 import { sessionToFile, fileToSession, formatSessionKey, DEFAULT_THREAD_ID, normalizeTopicLabel, normalizeTopicStatus, } from './session-mapper.js';
 import { tryParseChannelKey } from '../channel-loader.js';
+import { isMainSession, isMainSessionThreadId, isTopicSession, isTopicThreadId, mainTopicPeer, safeFormatMainTopicId, sessionLocalTopicId, sessionTopicThreadId, } from '../thread/topic-id.js';
 import { isSystemControlChannel } from '../system-channels.js';
 import path from 'path';
 import fs from 'fs';
@@ -507,11 +508,12 @@ export class SessionManager {
     /** 由 session 自身的 channelType/channelId/selfId/threadId 直接定位其 .jsonl 路径（不扫描目录）。 */
     metaPathForSession(session) {
         const dir = this.ensureChatDirForSession(session);
-        const targetDir = session.threadId ? path.join(dir, '_threads') : dir;
+        // 主话题落在 chat 根目录；只有话题进 `_threads/`。
+        const targetDir = isTopicSession(session) ? path.join(dir, '_threads') : dir;
         return this.metaFilePath(targetDir, session.id);
     }
     forkHistoryPath(session) {
-        if (!session.threadId)
+        if (!isTopicSession(session))
             throw new Error('fork history requires a topic session');
         return path.join(this.resolveChatDirFromSession(session), '_threads', `${session.id}.fork-history.json`);
     }
@@ -574,7 +576,7 @@ export class SessionManager {
         const loaded = this.loadSessionForUpdate(sessionId);
         const session = loaded?.current;
         const source = session?.metadata?.forkSource;
-        if (!session?.threadId || !source)
+        if (!isTopicSession(session) || !source)
             throw new Error('fork topic is missing');
         if (source.historyVersion) {
             this.readForkHistory(session);
@@ -626,7 +628,7 @@ export class SessionManager {
     appendMeta(channel, channelId, session) {
         const file = sessionToFile(session);
         const metaPath = this.metaPathForSession(session);
-        if (session.threadId)
+        if (isTopicSession(session))
             appendJsonlDurable(metaPath, file);
         else
             appendJsonl(metaPath, file);
@@ -671,7 +673,7 @@ export class SessionManager {
         // the newest backend fence unless this call is one of the two explicit
         // boundary writers.  This is a last-line guard against a stale object
         // replaying an old agentSessionId into the JSONL history.
-        if (session.threadId && !opts?.backendMutation) {
+        if (isTopicSession(session) && !opts?.backendMutation) {
             const latest = this.readMetaLatest(this.metaPathForSession(session));
             const latestId = normalizeBackendSessionId(latest?.agentSessionId);
             if (latest) {
@@ -714,7 +716,7 @@ export class SessionManager {
         }
         if (!opts?.forceWrite) {
             const metaPath = this.metaPathForSession(session);
-            const lastMeta = session.threadId
+            const lastMeta = isTopicSession(session)
                 ? readLastJsonlLineStrict(metaPath)
                 : readLastJsonlLine(metaPath);
             if (lastMeta && this.sessionFilesEqual(lastMeta, sessionToFile(session))) {
@@ -776,7 +778,7 @@ export class SessionManager {
             return undefined;
         // active.json 不能参与 topic backend boundary/CAS；它可能落后于线程 JSONL。
         const active = this.readActive(fromJsonl.channel, fromJsonl.channelId);
-        const base = (!fromJsonl.threadId && active && active.id === sessionId) ? active : fromJsonl;
+        const base = (isMainSession(fromJsonl) && active && active.id === sessionId) ? active : fromJsonl;
         const current = JSON.parse(JSON.stringify(base));
         return { current };
     }
@@ -789,8 +791,13 @@ export class SessionManager {
             logger.error(`[SessionManager] validateSessionFile: no adapter for baseagent=${session.baseagent}, session=${session.id}`);
             return agentSessionId;
         }
-        if (adapter.checkExists(session.projectPath, agentSessionId, session.selfAID))
+        const status = adapter.checkStatus?.(session.projectPath, agentSessionId, session.selfAID)
+            ?? (adapter.checkExists(session.projectPath, agentSessionId, session.selfAID) ? 'exists' : 'missing');
+        if (status === 'exists' || status === 'unavailable') {
+            if (status === 'unavailable')
+                logger.info(`[SessionManager] backend unavailable; preserving ${session.baseagent} session binding: ${agentSessionId}`);
             return agentSessionId;
+        }
         logger.warn(`Session file not found for ${session.baseagent}: ${agentSessionId}, clearing session ID`);
         session.agentSessionId = undefined;
         this.persistSession(session, 'sync');
@@ -800,11 +807,15 @@ export class SessionManager {
         if (!session.agentSessionId)
             return false;
         const adapter = this.getFileAdapter(session.baseagent);
-        return !!adapter?.checkExists(session.projectPath, session.agentSessionId, session.selfAID);
+        if (!adapter)
+            return false;
+        const status = adapter.checkStatus?.(session.projectPath, session.agentSessionId, session.selfAID)
+            ?? (adapter.checkExists(session.projectPath, session.agentSessionId, session.selfAID) ? 'exists' : 'missing');
+        return status !== 'missing';
     }
     getActiveChatType(channel, channelId) {
         const active = this.readActive(channel, channelId);
-        if (active && !active.threadId)
+        if (active && isMainSession(active))
             return active.chatType || 'private';
         return 'private';
     }
@@ -968,7 +979,7 @@ export class SessionManager {
         }
     }
     assertTopicResumeMutationTarget(current, input) {
-        if (!current.threadId || current.threadId !== input.expectedThreadId) {
+        if (sessionTopicThreadId(current) !== input.expectedThreadId) {
             const error = new Error('topic resumeAt threadId mismatch');
             error.code = 'THREAD_MISMATCH';
             throw error;
@@ -1035,7 +1046,7 @@ export class SessionManager {
         if (!input.expectedThreadId.trim())
             throw new Error('backend rotation requires a non-empty threadId');
         return this.mutateLatestTopicSession(input.sessionId, (current, found) => {
-            if (!current.threadId || current.threadId !== input.expectedThreadId) {
+            if (sessionTopicThreadId(current) !== input.expectedThreadId) {
                 const error = new Error('backend rotation threadId mismatch');
                 error.code = 'THREAD_MISMATCH';
                 throw error;
@@ -1084,7 +1095,7 @@ export class SessionManager {
             throw error;
         }
         return this.mutateLatestTopicSession(input.sessionId, (current, found) => {
-            if (!current.threadId)
+            if (!isTopicSession(current))
                 return 'stale';
             const active = current.metadata?.turnState?.active;
             if (!active
@@ -1223,7 +1234,8 @@ export class SessionManager {
         // 群聊场景下 conversationId 应为群 ID（AUN 群聊 channelId 即 groupId），私聊为 userId。
         // 用于 resolveIdentity fallback 正确命中群成员角色表（见 resolvePeerRoleDetail）。
         const identityConversationId = chatType === 'group' ? (metadata?.groupId || channelId) : userId;
-        if (threadId) {
+        // 主话题的 id（`main:<aid>:<aid>`）不是话题会话目录键：它必须落到 chat 根目录。
+        if (isTopicThreadId(threadId)) {
             const session = this.getOrCreateThreadSession(channel, channelId, threadId, defaultProjectPath, metadata, name, baseagent, selfAID, channelType, peerType, chatType, label, topicStatus);
             session.identity = identity ?? this.resolveIdentity(channel, userId, chatType, identityConversationId);
             return session;
@@ -1232,7 +1244,7 @@ export class SessionManager {
         const exactDir = this.resolveChatDirExact(channel, channelId, channelType, selfAID);
         const activeFile = readJsonFile(path.join(exactDir, 'active.json'));
         const active = activeFile ? fileToSession(activeFile) : undefined;
-        if (active && !active.threadId) {
+        if (active && isMainSession(active)) {
             const validSessionId = this.validateSessionFile(active);
             const session = { ...active, agentSessionId: validSessionId };
             session.identity = identity ?? this.resolveIdentity(channel, userId, chatType, identityConversationId);
@@ -1297,7 +1309,7 @@ export class SessionManager {
         const chatDir = this.resolveChatDir(channel, channelId, channelType, selfAID);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const existing = allSessions
-            .filter(s => s.projectPath === defaultProjectPath && !s.threadId)
+            .filter(s => s.projectPath === defaultProjectPath && isMainSession(s))
             .sort((a, b) => b.updatedAt - a.updatedAt)[0];
         if (existing) {
             const validSessionId = this.validateSessionFile(existing);
@@ -1342,7 +1354,7 @@ export class SessionManager {
             channelId,
             selfAID,
             projectPath: defaultProjectPath,
-            threadId: '',
+            rawThreadId: safeFormatMainTopicId(selfAID, channelId) ?? '',
             baseagent: resolvedBaseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: chatType || 'private',
@@ -1378,7 +1390,7 @@ export class SessionManager {
             error.code = 'BASEAGENT_IMMUTABLE';
             throw error;
         }
-        if (current.threadId && Object.prototype.hasOwnProperty.call(updates, 'agentSessionId')) {
+        if (isTopicSession(current) && Object.prototype.hasOwnProperty.call(updates, 'agentSessionId')) {
             const error = new Error('topic backend binding requires rotation or turn-lease activation');
             error.code = 'TOPIC_BACKEND_BINDING_PROTECTED';
             throw error;
@@ -1390,7 +1402,7 @@ export class SessionManager {
         if (updates.metadata !== undefined) {
             if (Object.hasOwn(updates.metadata, 'sessionLoop'))
                 throw topicMetadataOwnershipError('sessionLoop');
-            if (current.threadId) {
+            if (isTopicSession(current)) {
                 for (const key of Object.keys(updates.metadata)) {
                     if (TOPIC_METADATA_PROTECTED_KEYS.has(key))
                         throw topicMetadataOwnershipError(key);
@@ -1421,7 +1433,7 @@ export class SessionManager {
         for (const key of Object.keys(patch)) {
             if (key === 'sessionLoop')
                 throw topicMetadataOwnershipError(key);
-            if (current.threadId && TOPIC_METADATA_PROTECTED_KEYS.has(key)) {
+            if (isTopicSession(current) && TOPIC_METADATA_PROTECTED_KEYS.has(key)) {
                 throw topicMetadataOwnershipError(key);
             }
         }
@@ -1482,7 +1494,7 @@ export class SessionManager {
                 // by this generic lookup; doing so would let the next run create a
                 // backend without an explicit rotation.  Repair/rotation decides how
                 // to handle an unavailable bound backend.
-                const validSessionId = existing.threadId
+                const validSessionId = isTopicSession(existing)
                     ? normalizeBackendSessionId(existing.agentSessionId)
                     : this.validateSessionFile(existing);
                 let mutated = false;
@@ -1537,7 +1549,7 @@ export class SessionManager {
             channelId,
             selfAID: selfAID || '',
             projectPath,
-            threadId,
+            rawThreadId: threadId,
             baseagent: inheritedBaseagent,
             sessionKey,
             chatType: effectiveChatType,
@@ -1632,7 +1644,7 @@ export class SessionManager {
         const chatDir = this.ensureResolvedChatDir(channel, channelId, identity.channelType, identity.selfAID);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const target = allSessions
-            .filter(s => s.projectPath === newProjectPath && s.baseagent === baseagent && !s.threadId)
+            .filter(s => s.projectPath === newProjectPath && s.baseagent === baseagent && isMainSession(s))
             .sort((a, b) => b.updatedAt - a.updatedAt)[0];
         if (target) {
             const validSessionId = this.validateSessionFile(target);
@@ -1651,7 +1663,7 @@ export class SessionManager {
             channelId,
             selfAID,
             projectPath: newProjectPath,
-            threadId: '',
+            rawThreadId: safeFormatMainTopicId(selfAID, channelId) ?? '',
             baseagent: baseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,
@@ -1677,7 +1689,7 @@ export class SessionManager {
         const active = this.readActive(channel, channelId);
         if (!active)
             return;
-        if (active.threadId) {
+        if (isTopicSession(active)) {
             // Topic backend binding is owned exclusively by rotation or an active
             // TurnLease activation. Keep this legacy channel-scoped API main-session
             // only so stale callers cannot resurrect a renewed topic backend.
@@ -1692,7 +1704,7 @@ export class SessionManager {
         if (!loaded)
             return 'stale';
         const { current } = loaded;
-        if (current.threadId) {
+        if (isTopicSession(current)) {
             if (turnLease && normalizeBackendSessionId(agentSessionId)) {
                 return this.activateTopicBackend({ sessionId, lease: turnLease, agentSessionId });
             }
@@ -1719,7 +1731,7 @@ export class SessionManager {
         if (!loaded)
             return 'missing';
         const { current } = loaded;
-        if (current.threadId)
+        if (isTopicSession(current))
             return 'topic';
         const currentId = normalizeBackendSessionId(current.agentSessionId);
         if (!currentId)
@@ -1745,7 +1757,7 @@ export class SessionManager {
         const chatDir = this.ensureResolvedChatDir(channel, channelId, channelType, selfAID);
         const allSessions = this.findAllSessionsInChat(chatDir, false);
         const target = allSessions
-            .filter(s => s.projectPath === projectPath && s.baseagent === newBaseagent && !s.threadId)
+            .filter(s => s.projectPath === projectPath && s.baseagent === newBaseagent && isMainSession(s))
             .sort((a, b) => b.updatedAt - a.updatedAt)[0];
         if (target) {
             const validSessionId = this.validateSessionFile(target);
@@ -1760,7 +1772,7 @@ export class SessionManager {
             channelId,
             selfAID,
             projectPath,
-            threadId: '',
+            rawThreadId: safeFormatMainTopicId(selfAID, channelId) ?? '',
             baseagent: newBaseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,
@@ -1834,14 +1846,22 @@ export class SessionManager {
     hasMainSession(channel, channelId, channelType, selfAID) {
         const chatDir = this.resolveChatDirExact(channel, channelId, channelType, selfAID);
         const active = readJsonFile(path.join(chatDir, 'active.json'));
-        if (active && !active.threadId)
+        if (active && !isTopicThreadId(active.threadId))
             return true;
         return scanMetaFiles(chatDir).some(metaFile => {
             const session = readLastJsonlLine(path.join(chatDir, metaFile));
-            return !!session && !session.threadId;
+            return !!session && !isTopicThreadId(session.threadId);
         });
     }
     async getThreadSession(channel, channelId, threadId, selfAID) {
+        // 主话题 id 不在 `_threads/index.json` 里，它对应 chat 根目录的 active session。
+        // id 自带双方，必须校验"当前本端确实在两端之内"，且另一侧就是 channelId。
+        if (isMainSessionThreadId(threadId)) {
+            const self = selfAID?.replace(/^@/, '') ?? '';
+            if (selfAID && mainTopicPeer(threadId, self) !== channelId.replace(/^@/, ''))
+                return undefined;
+            return this.readActive(channel, channelId, channel === 'aun' ? 'aun' : undefined, selfAID);
+        }
         let chatDir;
         try {
             chatDir = this.resolveChatDirSafe(channel, channelId, channel === 'aun' ? 'aun' : undefined, selfAID);
@@ -1873,7 +1893,8 @@ export class SessionManager {
             .filter(session => {
             if (archiveFilter === 'all')
                 return true;
-            if (!session.threadId)
+            // 主话题没有业务状态，永远算"活跃"
+            if (!isTopicSession(session))
                 return archiveFilter !== 'archived';
             const archived = session.topicStatus === 'archived';
             return archiveFilter === 'archived' ? archived : !archived;
@@ -1937,19 +1958,24 @@ export class SessionManager {
         current.metadata = metadata;
         this.persistSession(current, 'sync');
     }
-    async renameSession(sessionId, newName) {
+    async renameSession(sessionId, newName, nameUpdatedAt) {
         const loaded = this.loadSessionForUpdate(sessionId);
         if (!loaded)
             return false;
         const { current } = loaded;
         current.name = newName;
+        // 主话题的名称版本跟着会话走（话题在索引条目上）。远端同步来的改名必须
+        // 带版本，否则后续无法判断"谁更新"。本地改名不传时保持不写版本。
+        if (nameUpdatedAt !== undefined) {
+            current.metadata = { ...(current.metadata ?? {}), nameUpdatedAt };
+        }
         this.persistSession(current, 'sync');
         return true;
     }
     async setTopicLabel(sessionId, label) {
         const normalized = normalizeTopicLabel(label);
         const loaded = this.loadSessionForUpdate(sessionId);
-        if (!loaded?.current.threadId)
+        if (!loaded || !isTopicSession(loaded.current))
             return false;
         loaded.current.label = normalized;
         this.persistSession(loaded.current, 'sync', { topicMutation: true });
@@ -1958,7 +1984,7 @@ export class SessionManager {
     async setTopicStatus(sessionId, status) {
         const normalized = normalizeTopicStatus(status);
         const loaded = this.loadSessionForUpdate(sessionId);
-        if (!loaded?.current.threadId)
+        if (!loaded || !isTopicSession(loaded.current))
             return false;
         loaded.current.topicStatus = normalized;
         this.persistSession(loaded.current, 'sync', { topicMutation: true });
@@ -2115,7 +2141,7 @@ export class SessionManager {
             channelId,
             selfAID,
             projectPath,
-            threadId: '',
+            rawThreadId: safeFormatMainTopicId(selfAID, channelId) ?? '',
             baseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,
@@ -2155,7 +2181,7 @@ export class SessionManager {
     }
     async createForkedSession(sourceSession, forkedAgentSessionId, name) {
         const channelType = sourceSession.channelType || sourceSession.channel;
-        const threadId = sourceSession.threadId || '';
+        const sourceTopicId = sessionTopicThreadId(sourceSession);
         const session = {
             id: generateSessionId(),
             channel: sourceSession.channel,
@@ -2163,9 +2189,9 @@ export class SessionManager {
             channelId: sourceSession.channelId,
             selfAID: sourceSession.selfAID,
             projectPath: sourceSession.projectPath,
-            threadId,
+            rawThreadId: sourceTopicId ?? sessionLocalTopicId(sourceSession) ?? '',
             baseagent: sourceSession.baseagent,
-            sessionKey: formatSessionKey(channelType, sourceSession.channelId, threadId || DEFAULT_THREAD_ID),
+            sessionKey: formatSessionKey(channelType, sourceSession.channelId, sourceTopicId ?? DEFAULT_THREAD_ID),
             chatType: sourceSession.chatType || 'private',
             agentSessionId: forkedAgentSessionId,
             metadata: {},
@@ -2209,7 +2235,7 @@ export class SessionManager {
             replyContext: { threadId: targetThreadId },
             forkSource: {
                 sessionId: sourceSession.id,
-                threadId: sourceSession.threadId || null,
+                threadId: sessionTopicThreadId(sourceSession) ?? null,
                 assistantMessageId: options.sourceAssistantMessageId,
                 ...(options.requestedSourceAssistantMessageId
                     ? { requestedAssistantMessageId: options.requestedSourceAssistantMessageId } : {}),
@@ -2229,7 +2255,7 @@ export class SessionManager {
             channelId: sourceSession.channelId,
             selfAID: sourceSession.selfAID,
             projectPath: sourceSession.projectPath,
-            threadId: targetThreadId,
+            rawThreadId: targetThreadId,
             baseagent: sourceSession.baseagent,
             sessionKey,
             chatType: 'private',
@@ -2277,7 +2303,7 @@ export class SessionManager {
             projectPath: session.projectPath,
             name: session.name,
             chatType: session.chatType,
-            threadId: session.threadId,
+            threadId: sessionTopicThreadId(session),
             baseagent: session.baseagent,
             timestamp: now,
         });
@@ -2301,7 +2327,8 @@ export class SessionManager {
             channelId: sourceSession.channelId,
             selfAID: sourceSession.selfAID,
             projectPath: sourceSession.projectPath,
-            threadId: '',
+            // 续期沿用原会话的话题身份：主话题保持规范 id，话题保持原 id。
+            rawThreadId: sessionLocalTopicId(sourceSession) ?? '',
             baseagent: context?.baseagent || sourceSession.baseagent,
             sessionKey: formatSessionKey(sourceSession.channelType || sourceSession.channel, sourceSession.channelId, DEFAULT_THREAD_ID),
             chatType: sourceSession.chatType || 'private',
@@ -2328,7 +2355,7 @@ export class SessionManager {
             sourceChannel: sourceSession.channelType || sourceSession.channel,
             sourceChannelId: sourceSession.channelId,
             sourceChatType: sourceSession.chatType,
-            sourceThreadId: sourceSession.threadId,
+            sourceThreadId: sessionTopicThreadId(sourceSession),
             sourceSelfAid: sourceSession.selfAID,
             sourcePeerId: sourceSession.metadata?.peerId,
             timestamp: Date.now(),
@@ -2447,7 +2474,7 @@ export class SessionManager {
             channelId,
             selfAID,
             projectPath,
-            threadId: '',
+            rawThreadId: safeFormatMainTopicId(selfAID, channelId) ?? '',
             baseagent: resolvedBaseagent,
             sessionKey: formatSessionKey(channelType, channelId, DEFAULT_THREAD_ID),
             chatType: inheritedChatType,

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

@@ -1,4 +1,5 @@
 import { formatTimestamp } from './session-fs-store.js';
+import { classifyThreadId, sessionThreadKind } from '../thread/topic-id.js';
 /** Default topic component used by the stable session routing key. */
 export const DEFAULT_THREAD_ID = 'main';
 export function normalizeTopicLabel(value) {
@@ -98,7 +99,10 @@ export function sessionToFile(session) {
     }
     const now = session.updatedAt || Date.now();
     const channelType = session.channelType || session.channel;
-    const threadId = session.threadId || DEFAULT_THREAD_ID;
+    // sessionKey 的第三段始终是渠道级占位 `main`：主话题的规范 id 会随关系变化，
+    // 而 sessionKey 是路由键，不能因为对方 AID 不同就换一个存储位置。
+    const kind = sessionThreadKind(session);
+    const threadId = kind.kind === 'topic' ? kind.threadId : DEFAULT_THREAD_ID;
     if (!session.baseagent) {
         throw new Error(`[session-mapper] sessionToFile: session.baseagent is empty for session ${session.id}`);
     }
@@ -110,13 +114,16 @@ export function sessionToFile(session) {
         sessionKey: formatSessionKey(channelType, session.channelId, threadId),
         selfAID: session.selfAID,
         baseagent: session.baseagent,
-        threadId: session.threadId || '',
+        // 主话题落盘的是规范 id（`main:<aid>:<aid>`），不是空串——展示、持久化、
+        // 消费必须是同一个字符串。内部对端（bg:/trigger:/daemon:）与缺 selfAID 的
+        // 非 AUN 渠道拼不出 id，退回空串，读取端用 isMainSessionThreadId 统一识别。
+        threadId: kind.kind === 'topic' ? kind.threadId : (kind.topicId ?? ''),
         chatType: session.chatType || 'private',
         projectPath: session.projectPath,
         agentSessionId: session.agentSessionId ?? null,
         name: session.name ?? null,
         ...(session.label ? { label: session.label } : {}),
-        ...(session.threadId ? { topicStatus: session.topicStatus ?? 'pending' } : {}),
+        ...(kind.kind === 'topic' ? { topicStatus: session.topicStatus ?? 'pending' } : {}),
         activeTask: session.processingState ?? null,
         metadata,
         createdAt: session.createdAt,
@@ -153,22 +160,26 @@ export function fileToSession(file) {
         if (v !== undefined)
             metadata[k] = v;
     }
+    // 主话题的 threadId 在旧文件里是空串（更早是 "main"）。读入时统一补成规范 id，
+    // 让内存中的 Session 与 list/CLI 看到的是同一个字符串；写回时 sessionToFile 会落盘。
+    const kind = classifyThreadId(file.threadId, file.selfAID, file.channelId);
+    const isTopic = kind.kind === 'topic';
     return {
         id: file.id,
         channel: file.channel,
         channelType: file.channelType,
         channelId: file.channelId,
-        sessionKey: file.sessionKey || formatSessionKey(file.channelType, file.channelId, file.threadId || DEFAULT_THREAD_ID),
+        sessionKey: file.sessionKey || formatSessionKey(file.channelType, file.channelId, isTopic ? kind.threadId : DEFAULT_THREAD_ID),
         selfAID: file.selfAID,
         baseagent,
-        threadId: file.threadId,
+        rawThreadId: isTopic ? kind.threadId : (kind.topicId ?? ''),
         chatType: file.chatType,
         projectPath: file.projectPath,
         agentSessionId: file.agentSessionId ?? undefined,
         name: file.name ?? undefined,
-        ...(file.threadId && (file.label || (file.lable && file.lable !== '归档'))
+        ...(isTopic && (file.label || (file.lable && file.lable !== '归档'))
             ? { label: file.label || file.lable } : {}),
-        ...(file.threadId ? { topicStatus: file.topicStatus
+        ...(isTopic ? { topicStatus: file.topicStatus
                 ? normalizeTopicStatus(file.topicStatus)
                 : file.lable === '归档' ? 'archived' : 'pending' } : {}),
         processingState: file.activeTask ?? undefined,

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

@@ -6,6 +6,7 @@ import { logger } from '../../utils/logger.js';
 import { isTransientProtocolMessage, messageLogPath } from '../message/message-log.js';
 import { readAllJsonlLines } from './session-fs-store.js';
 import { getPackageRoot } from '../../paths.js';
+import { isTopicSession, sessionTopicThreadId } from '../thread/topic-id.js';
 const DEFAULT_AFTER_HOURS = 24;
 const DEFAULT_FALLBACK = 'continue';
 const DEFAULT_NEW_PROBABILITY_THRESHOLD = 0.85;
@@ -159,7 +160,7 @@ export class SessionRenewService {
             return { session: request.session, renewed: false };
         // Thread / processing sessions are already an explicit routing decision.
         // Do not let a cached or active main session replace them before resolveLocked().
-        if (request.session.threadId || request.session.processingState) {
+        if (isTopicSession(request.session) || request.session.processingState) {
             return { session: request.session, renewed: false };
         }
         const routeKey = this.routeKey(request);
@@ -220,11 +221,11 @@ export class SessionRenewService {
         let decision;
         let source = 'model';
         let judgeMetadata = {
-            model: effectiveConfig.decision_model?.model,
+            model: effectiveConfig.Services?.decision ? effectiveConfig.Services.decision.model : effectiveConfig.decision_model?.model,
             threshold,
         };
         try {
-            const model = effectiveConfig.decision_model?.model?.trim();
+            const model = (effectiveConfig.Services?.decision ? effectiveConfig.Services.decision.model : effectiveConfig.decision_model?.model)?.trim();
             if (!model)
                 throw new SessionRenewJudgeError('decision_model_missing');
             const provider = this.inferenceProviderResolver.getDecisionInferenceProvider(request.selfAid);
@@ -355,7 +356,7 @@ export class SessionRenewService {
         }
     }
     routeKey(request) {
-        return [request.channelType, request.selfAid || '', request.channelId, request.session.threadId || ''].join('#');
+        return [request.channelType, request.selfAid || '', request.channelId, sessionTopicThreadId(request.session) ?? ''].join('#');
     }
     async withLock(key, operation) {
         const previous = this.locks.get(key) ?? Promise.resolve();

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

@@ -1,3 +1,4 @@
+import { isTopicThreadId } from '../thread/topic-id.js';
 const SYSTEM_PROMPT_MARKERS = [
     '--- [SYSTEM_PROMPT_END] ---',
     '<system-reminder>',
@@ -150,5 +151,5 @@ export function shouldAutoFillSessionTitle(title, threadId) {
     const normalized = sanitizeSessionTitle(title);
     if (normalized === '默认会话')
         return true;
-    return !!threadId && threadId !== 'main' && normalized === '话题会话';
+    return isTopicThreadId(threadId) && normalized === '话题会话';
 }

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

@@ -107,7 +107,7 @@ export class SessionTurnCoordinator {
         await this.persist(session, next);
         return cloneTurnMetadata(next);
     }
-    async completeInterrupt(session, reason) {
+    async completeInterrupt(session, reason, recoverable) {
         const state = this.hydrate(session);
         const active = state.active;
         if (!active) {
@@ -139,6 +139,7 @@ export class SessionTurnCoordinator {
                             ? 'cancelled'
                             : 'superseded',
                 reason,
+                ...(recoverable !== undefined ? { recoverable } : {}),
                 finishedAt: Date.now(),
             },
         };
@@ -213,7 +214,7 @@ export class SessionTurnCoordinator {
         await this.persist(session, next);
         return decision;
     }
-    async finish(session, lease, status, reason) {
+    async finish(session, lease, status, reason, recoverable) {
         const state = this.hydrate(session);
         if (!this.isCurrent(lease))
             return false;
@@ -227,6 +228,7 @@ export class SessionTurnCoordinator {
                 status,
                 recoveryContext: terminalRecoveryContext(session, state.active?.recoveryContext),
                 reason,
+                ...(recoverable !== undefined ? { recoverable } : {}),
                 finishedAt: Date.now(),
             },
         };

package/dist/core/skill/index-generator.js

@@ -35,25 +35,11 @@ function generateOneIndex(indexDir, filename, skills, label) {
         }
         return;
     }
-    // 根目录从任一条目反推（同组内同源，父目录一致）
-    const rootDir = path.dirname(skills[0].skillDir);
-    // 示例用第一个技能的真实路径——模型照抄真路径比按规则推导可靠
-    const exampleName = skills[0].name;
-    const examplePath = path.join(skills[0].skillDir, 'SKILL.md');
-    // 路径规则块（用 path.sep，示例路径用真实技能名）
-    const sep = path.sep;
     const header = `[skills-${label}] 本 Agent 已启用 ${skills.length} 个${label === 'builtin' ? '内置' : '本机'}技能。
 
-加载方式: EC 技能用 Read 工具读取上面对应的 SKILL.md 全文后按内容执行；
+加载方式:
+  EC 技能用 \`ec skill load <技能名>\` 加载，命令直接输出 SKILL.md 正文并附带技能目录的绝对路径。
   它们不是宿主工具自带的技能或斜杠命令，用 Skill/斜杠命令加载会报 Unknown skill/未知命令。
-
-路径规则:
-  根目录: ${rootDir}
-  技能目录 = 根目录 + "${sep}" + 技能名
-  SKILL.md = 技能目录 + "${sep}SKILL.md"
-  例: 技能名为 ${exampleName}，其 SKILL.md 完整路径为
-      ${examplePath}
-  执行脚本时必须写完整绝对路径。
 `;
     // 技能条目（name + description）
     const items = [];

package/dist/core/task/task-recovery-service.js

@@ -1,5 +1,12 @@
 import { replyContextFromSession } from '../message/message-utils.js';
+import { sessionTopicThreadId } from '../thread/topic-id.js';
 export const TASK_RECOVERY_PROMPT = '继续当前会话尚未完成的任务。先核对最新用户指令、已有结果和任务状态；若已完成、用户已停止或正在等待必要输入/审批，则不要重复执行。对可能已产生副作用的步骤先核实结果，再继续未完成的工作。';
+/**
+ * Turn failure reason prefix: the agent run finished normally but delivering
+ * its final reply failed. Re-running the agent cannot fix a transport failure,
+ * so automatic recovery must not pick these turns up.
+ */
+export const REPLY_DELIVERY_FAILED_REASON = 'reply_delivery_failed';
 function lastTask(state) {
     return state?.active ?? state?.lastTerminal;
 }
@@ -22,7 +29,11 @@ function canRecover(session, automatic, origin) {
         || (context?.agentSessionId && context.agentSessionId !== session.agentSessionId))
         return false;
     const reason = 'cancelReason' in task ? task.cancelReason : 'reason' in task ? task.reason : undefined;
-    if (reason && /interaction|approval|permission|denied|recalled|new_message|empty_prompt/i.test(reason))
+    // Provider/model configuration is deterministic: an automatic retry resumes
+    // the same failed thread on the same missing model and only extends the loop.
+    if (reason && /interaction|approval|permission|denied|recalled|new_message|empty_prompt|invalid_model|model_not_found|model_unavailable/i.test(reason))
+        return false;
+    if (automatic && reason?.startsWith(REPLY_DELIVERY_FAILED_REASON))
         return false;
     if (task.status === 'cancelled' || task.status === 'superseded' || reason === 'stop' || reason === 'explicit_cancel') {
         return !automatic && (reason === 'stop' || reason === 'explicit_cancel');
@@ -31,6 +42,8 @@ function canRecover(session, automatic, origin) {
         return true;
     if (state?.active)
         return false;
+    if (state?.lastTerminal?.recoverable !== true)
+        return false;
     return !context?.originTriggerId || sameRecoveryRun(context.recovery, origin);
 }
 /** Check again at dequeue: a newer task, /stop, /renew or backend switch wins. */
@@ -150,7 +163,7 @@ export class TaskRecoveryService {
                     } } : {}),
                 channel: session.metadata?.channelKey || session.channel,
                 channelType, channelId: session.channelId, selfAID: session.selfAID,
-                baseagent: session.baseagent, threadId: session.threadId,
+                baseagent: session.baseagent, threadId: sessionTopicThreadId(session) ?? '',
                 chatType: session.chatType === 'group' ? 'group' : 'private',
                 groupId: session.chatType === 'group' ? session.metadata?.groupId || session.channelId : undefined,
                 peerId, peerName, peerType,