evolcore 0.0.34 → 0.0.35

package/dist/core/permission/ec-command-parser.js

@@ -619,6 +619,10 @@ function isLiteralArgBoundary(value) {
  * 判为 `shell-composition`，拦截力度不变，只让错误归因准确。
  */
 function isPosixQuotedTokenBoundary(value) {
+    // 相邻引号段直接拼接（`'a''b'`、`$'a''b'`、`'a'"b"`）与 bash 一致：
+    // 闭合引号后紧跟另一个开引号不是错误，两个段拼进同一个 token。
+    if (value === "'" || value === '"')
+        return true;
     return value === undefined || isShellSpacing(value) || SHELL_UNQUOTED_META.has(value);
 }
 function isShellParameterExpansionStart(value) {
@@ -1657,6 +1661,54 @@ export function parseLiteralShellCommand(command, options = {}) {
             token += next;
             continue;
         }
+        // ANSI-C quoting: $'...' allows \n \t \r \\ \' escapes, same as bash $'...'.
+        // Must be checked before SHELL_UNQUOTED_META because $ is in that set.
+        if (char === '$' && input[index + 1] === "'") {
+            tokenStarted = true;
+            index += 2; // skip $ and opening '
+            let ansiClosed = false;
+            while (index < input.length) {
+                const c = input[index];
+                if (c === "'") {
+                    ansiClosed = true;
+                    break; // leave index at closing '; for-loop increment moves past it
+                }
+                if (c === '\\') {
+                    const esc = input[++index];
+                    if (esc === undefined)
+                        break;
+                    switch (esc) {
+                        case 'n':
+                            token += '\n';
+                            break;
+                        case 't':
+                            token += '\t';
+                            break;
+                        case 'r':
+                            token += '\r';
+                            break;
+                        case '\\':
+                            token += '\\';
+                            break;
+                        case "'":
+                            token += "'";
+                            break;
+                        default:
+                            token += `\\${esc}`;
+                            break;
+                    }
+                    index++;
+                    continue;
+                }
+                token += c;
+                index++;
+            }
+            if (!ansiClosed)
+                return parseFailure('invalid-quote', input, index, argv.length, 'posix');
+            if (!isPosixQuotedTokenBoundary(input[index + 1]))
+                return parseFailure('invalid-quote', input, index, argv.length, 'posix');
+            continue;
+        }
         // `#` starts a shell comment only at the beginning of a word. Channel
         // peer keys such as `aun#alice` are ordinary literal arguments.
         if ((SHELL_UNQUOTED_META.has(char) && (char !== '#' || !tokenStarted))
@@ -1712,6 +1764,11 @@ export function parseCodexShellCommandArgv(command, options = {}) {
         });
         return parsed.ok ? canonicalizeEvolcoreCommandArgv(parsed.argv) : null;
     }
+    const stringCarrier = resolveCodexShellCarrierString(command);
+    if (stringCarrier) {
+        const parsed = parseCodexCarrierCommand(stringCarrier, options);
+        return parsed.ok ? normalizeEvolcoreCommandArgv(parsed.argv) : null;
+    }
     const outer = parseLiteralShellArgv(command, options);
     if (outer) {
         const carrier = resolveCodexShellCarrierArgv(outer);
@@ -1719,20 +1776,11 @@ export function parseCodexShellCommandArgv(command, options = {}) {
             const parsed = parseCodexCarrierCommand(carrier, options);
             return parsed.ok ? parsed.argv : null;
         }
-        const stringCarrier = resolveCodexShellCarrierString(command);
-        if (stringCarrier) {
-            const parsed = parseCodexCarrierCommand(stringCarrier, options);
-            return parsed.ok ? parsed.argv : null;
-        }
         if (parseCodexCmdCarrierStringFailure(command, options))
             return null;
         return normalizeEvolcoreCommandArgv(outer);
     }
-    const stringCarrier = resolveCodexShellCarrierString(command);
-    if (!stringCarrier)
-        return null;
-    const parsed = parseCodexCarrierCommand(stringCarrier, options);
-    return parsed.ok ? normalizeEvolcoreCommandArgv(parsed.argv) : null;
+    return null;
 }
 /** Parse a Codex tool input while preserving safe syntax failure metadata. */
 export function parseCodexToolCommand(input, options = {}) {
@@ -1776,22 +1824,20 @@ export function parseCodexToolCommand(input, options = {}) {
             ? { ...parsed, argv: normalizeEvolcoreCommandArgv(parsed.argv) }
             : parsed;
     }
+    const stringCarrier = resolveCodexShellCarrierString(command);
+    if (stringCarrier) {
+        return parseCodexCarrierCommand(stringCarrier, { allowManagedTmpDir: true, ...options });
+    }
     const outer = parseLiteralShellCommand(command, { allowManagedTmpDir: true });
     if (outer.ok) {
         const carrier = resolveCodexShellCarrierArgv(outer.argv);
         if (carrier !== undefined) {
             return parseCodexCarrierCommand(carrier, { allowManagedTmpDir: true, ...options });
         }
-        const stringCarrier = resolveCodexShellCarrierString(command);
-        return stringCarrier
-            ? parseCodexCarrierCommand(stringCarrier, { allowManagedTmpDir: true, ...options })
-            : parseCodexCmdCarrierStringFailure(command, { allowManagedTmpDir: true })
-                ?? { ...outer, argv: normalizeEvolcoreCommandArgv(outer.argv) };
+        return parseCodexCmdCarrierStringFailure(command, { allowManagedTmpDir: true })
+            ?? { ...outer, argv: normalizeEvolcoreCommandArgv(outer.argv) };
     }
-    const stringCarrier = resolveCodexShellCarrierString(command);
-    return stringCarrier
-        ? parseCodexCarrierCommand(stringCarrier, { allowManagedTmpDir: true, ...options })
-        : parseCodexCmdCarrierStringFailure(command, { allowManagedTmpDir: true }) ?? outer;
+    return parseCodexCmdCarrierStringFailure(command, { allowManagedTmpDir: true }) ?? outer;
 }
 function isApplyPatchExecutable(value) {
     const normalized = value.replaceAll('\\', '/').replace(/\/+$/u, '');
@@ -2747,6 +2793,17 @@ export function classifyEvolcoreShellCommand(command, options = {}) {
         });
         return { kind: 'composite', issue: parsed.ok ? 'shell-composition' : parsed.issue };
     }
+    const stringCarrier = resolveCodexShellCarrierString(stripped);
+    if (stringCarrier) {
+        const nested = parseCodexCarrierCommand(stringCarrier, parseOptions);
+        if (nested.ok && nested.argv[0] === 'ec')
+            return { kind: 'literal' };
+        if (!nested.ok && (hasCarrierEcCommandPrefix(stringCarrier.command, stringCarrier.dialect)
+            || (stringCarrier.dialect === 'powershell' && hasPowerShellCredentialAssignment(stringCarrier.command)))) {
+            return { kind: 'composite', issue: nested.issue };
+        }
+        return { kind: 'none' };
+    }
     const literal = parseLiteralShellCommand(stripped, parseOptions);
     if (literal.ok) {
         if (normalizeEvolcoreCommandArgv(literal.argv)[0] === 'ec')
@@ -2761,16 +2818,6 @@ export function classifyEvolcoreShellCommand(command, options = {}) {
                 return { kind: 'composite', issue: nested.issue };
             }
         }
-        const stringCarrier = resolveCodexShellCarrierString(stripped);
-        if (stringCarrier) {
-            const nested = parseCodexCarrierCommand(stringCarrier, parseOptions);
-            if (nested.ok && nested.argv[0] === 'ec')
-                return { kind: 'literal' };
-            if (!nested.ok && (hasCarrierEcCommandPrefix(stringCarrier.command, stringCarrier.dialect)
-                || (stringCarrier.dialect === 'powershell' && hasPowerShellCredentialAssignment(stringCarrier.command)))) {
-                return { kind: 'composite', issue: nested.issue };
-            }
-        }
         const malformedCmdBody = extractCodexCmdCarrierBody(stripped);
         if (malformedCmdBody && looksLikeEcCommandBody(malformedCmdBody)) {
             const nested = parseLiteralShellCommand(malformedCmdBody, {
@@ -2783,17 +2830,6 @@ export function classifyEvolcoreShellCommand(command, options = {}) {
         }
         return { kind: 'none' };
     }
-    const stringCarrier = resolveCodexShellCarrierString(stripped);
-    if (stringCarrier) {
-        const nested = parseCodexCarrierCommand(stringCarrier, parseOptions);
-        if (nested.ok && nested.argv[0] === 'ec')
-            return { kind: 'literal' };
-        if (!nested.ok && (hasCarrierEcCommandPrefix(stringCarrier.command, stringCarrier.dialect)
-            || (stringCarrier.dialect === 'powershell' && hasPowerShellCredentialAssignment(stringCarrier.command)))) {
-            return { kind: 'composite', issue: nested.issue };
-        }
-        return { kind: 'none' };
-    }
     const malformedCmdBody = extractCodexCmdCarrierBody(stripped);
     if (malformedCmdBody && looksLikeEcCommandBody(malformedCmdBody)) {
         const nested = parseLiteralShellCommand(malformedCmdBody, {

package/dist/core/permission/tool-policy.js

@@ -2314,6 +2314,36 @@ function prepareBoundedOutputInput(input, command, kind, context) {
         reason: kind === 'ec' ? 'ec-command' : 'host-process-command',
     };
 }
+const BASH_RISK_LEVELS = new Set(['低', '中', '高']);
+/**
+ * Bash 调用的 description 必须是「<命令目标描述> [<风险等级>]」。
+ * 只适用于 Bash 工具 schema 带 description 字段的基座（Claude Code、ecagent），
+ * 是调用格式约定而非权限判定，不区分会话类型与 permissionMode。
+ */
+export function checkBashDescription(toolName, input) {
+    if (toolName !== 'Bash')
+        return undefined;
+    const FORMAT_HINT = 'description 格式为「<命令目标描述> [<风险等级>]」，风险等级只能是 [低]、[中]、[高] 之一。示例："查看工作区未提交的改动 [低]"、"安装项目依赖 [中]"、"推送 main 分支到远端 [高]"。这是格式问题，不是权限问题，补全后重试。';
+    const deny = (problem, policyCode) => ({
+        behavior: 'deny',
+        input,
+        message: `Bash 调用被拒：${problem}。${FORMAT_HINT}`,
+        policyCode,
+    });
+    const description = typeof input.description === 'string' ? input.description.trim() : '';
+    if (!description) {
+        return deny('缺少 description，既没有命令目标描述，也没有风险等级标记', 'bash_description_missing');
+    }
+    const tag = description.match(/\[([^[\]]*)\]$/);
+    if (!tag)
+        return deny('description 末尾缺少风险等级标记', 'bash_risk_level_missing');
+    if (!BASH_RISK_LEVELS.has(tag[1]))
+        return deny(`风险等级标记 [${tag[1]}] 无效`, 'bash_risk_level_invalid');
+    if (!description.slice(0, tag.index).trim()) {
+        return deny('description 缺少命令目标描述，只有风险等级标记', 'bash_description_target_missing');
+    }
+    return undefined;
+}
 /** Shared fail-closed preflight used before runner-specific mode and approval handling. */
 export function evaluateToolPreflight(toolName, input, context) {
     let applyPatchFileChanges;
@@ -2570,7 +2600,7 @@ export function evaluateToolPreflight(toolName, input, context) {
                     ? '🔒 EC 命令包含无法安全解析的 PowerShell 展开；临时路径仅支持已登记的当前会话 $env:TMPDIR 或 ${env:TMPDIR}，也可使用完整路径。纯文字请使用单引号，或用 PowerShell 反引号转义 $ 和正文内的双引号。'
                     : shellDialect === 'cmd'
                         ? '🔒 EC 命令包含未转义的 cmd.exe 展开；请不要使用 %VAR%、!VAR! 或 ^ 转义。cmd.exe 传给 ec 时必须保持原文字面量'
-                        : '🔒 EC 自由文本参数（正文、--desc、--name、--keywords 等）一律用单引号包住；双引号内的反引号与 $ 会被 shell 展开。正文里不要再出现半角撇号（ASCII 0x27），需要时用 `ʼ`（U+02BC）或 `＇`（U+FF07）';
+                        : '🔒 EC 自由文本参数（正文、--desc、--name、--keywords 等）一律用单引号包住；双引号内的反引号与 $ 会被 shell 展开。正文含单引号时改用 $\'…\' 语法（支持 \\n \\t \\\\ \\\'）。';
                 return {
                     behavior: 'deny',
                     input,
@@ -2583,7 +2613,7 @@ export function evaluateToolPreflight(toolName, input, context) {
                     ? '🔒 EC 命令引号未闭合或存在错误嵌套。Note: PowerShell 把 U+2018/U+2019/U+201A/U+201B 也当引号定界符——正文里出现这四个字符同样会报此错。正文一律用半角单引号（ASCII 0x27）包住，正文内部的半角撇号用 `ʼ`（U+02BC）或 `＇`（U+FF07）代替，或把消息正文写入当前 $TMPDIR 后使用 --text-from-file'
                     : shellDialect === 'cmd'
                         ? '🔒 EC 命令引号未闭合或存在错误嵌套；cmd.exe carrier 的命令正文请保持一个完整参数，不要用未配对的双引号'
-                        : '🔒 EC 命令引号未闭合或存在错误嵌套。自由文本参数一律用单引号包住；正文里不要出现半角撇号（ASCII 0x27）本身，需要时用 `ʼ`（U+02BC）或 `＇`（U+FF07）';
+                        : '🔒 EC 命令引号未闭合或存在错误嵌套。自由文本参数用单引号包住；正文含单引号时改用 $\'…\' 语法，内部用 \\\' 转义，如 $\'it\\\'s fine\'。';
                 return {
                     behavior: 'deny',
                     input,

package/dist/core/relation/peer-identity.js

@@ -1,3 +1,54 @@
+/**
+ * 解析 agent.md 的 YAML frontmatter。
+ *
+ * agent.md 形如：
+ *   ---
+ *   aid: xxx
+ *   type: human
+ *   ...
+ *   ---
+ *   <正文>
+ *
+ * 返回整份 frontmatter（不是只挑 type/name），调用方据此写完整画像。
+ * 文档不合法（无 frontmatter、YAML 解析失败）时返回空对象——身份缓存
+ * 不应因为一个可选的元数据块解析失败而整体失效。
+ */
+export function parseAgentMdFrontmatter(content) {
+    const text = content.replace(/^\uFEFF/, '');
+    const lines = text.split(/\r\n|\n|\r/);
+    if (lines[0]?.trim() !== '---')
+        return {};
+    const end = lines.slice(1).findIndex(line => line.trim() === '---');
+    if (end < 0)
+        return {};
+    try {
+        const parsed = parseYaml(lines.slice(1, end + 1).join('\n'));
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+            ? parsed
+            : {};
+    }
+    catch {
+        return {};
+    }
+}
+/**
+ * 兼容旧缓存文件：字段从 `isAgent` 改名为 `isMachine` 之前写下的
+ * peer-identity.json 只有 isAgent。两者语义相同（type !== 'human'），
+ * 缓存有效期长达 30 天，不能指望靠下一次刷新自然迁移——
+ * 读取时直接归一，缺字段就用旧字段或 type 推出。
+ */
+function normalizeCachedIdentity(raw) {
+    if (!raw || typeof raw !== 'object')
+        return null;
+    const value = raw;
+    const type = typeof value.type === 'string' ? value.type : 'unknown';
+    const isMachine = typeof value.isMachine === 'boolean'
+        ? value.isMachine
+        : typeof value.isAgent === 'boolean'
+            ? value.isAgent
+            : type !== 'human';
+    return { ...value, type, isMachine, isAgent: isMachine };
+}
 /**
  * PeerIdentityCache - 对端身份缓存管理
  *
@@ -13,6 +64,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as crypto from 'crypto';
+import { parse as parseYaml } from 'yaml';
 import { logger } from '../../utils/logger.js';
 import { agentMdPath } from '../../paths.js';
 /**
@@ -56,7 +108,7 @@ export class PeerIdentityCache {
         const filePath = this.getFilePath(channelType, peerId, agentDir);
         try {
             const content = fs.readFileSync(filePath, 'utf-8');
-            return JSON.parse(content);
+            return normalizeCachedIdentity(JSON.parse(content));
         }
         catch {
             return null;
@@ -87,6 +139,10 @@ export class PeerIdentityCache {
         const cached = this.get(channelType, peerId, agentDir);
         if (!cached)
             return true;
+        // 旧快照缺 metadata（字段补全之前写入）时需要重建一次，否则 30 天内
+        // 都会直接命中缓存，新字段永远补不上。
+        if (cached.source !== 'unknown' && cached.metadata === undefined)
+            return true;
         const effectiveMaxAge = cached.source === 'unknown'
             ? Math.min(maxAgeMs, this.UNKNOWN_CACHE_MAX_AGE_MS)
             : maxAgeMs;
@@ -98,17 +154,28 @@ export class PeerIdentityCache {
      * @param verifiedAt 验签通过时间戳；未验签传 0
      */
     static updateFromAgentMd(channelType, peerId, agentDir, agentMd, verifiedAt, source = 'agentmd') {
-        const typeMatch = agentMd.match(/^type:\s*["']?([^"'\n]+?)["']?\s*$/m);
-        const nameMatch = agentMd.match(/^name:\s*["']?(.+?)["']?\s*$/m);
-        const type = typeMatch?.[1] || 'unknown';
-        const isAgent = type !== 'human';
-        const name = nameMatch?.[1]?.trim();
+        // 保留整份 frontmatter：这份缓存是对端自我声明的完整画像，
+        // 只截取 type/name 会在上游新增字段（exttype/owner/tags/avatar…）时静默丢失。
+        const metadata = parseAgentMdFrontmatter(agentMd);
+        const readString = (key) => {
+            const value = metadata[key];
+            return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+        };
+        const type = readString('type') ?? 'unknown';
+        const isMachine = type !== 'human';
+        const name = readString('name');
+        const exttype = readString('exttype');
+        const owner = readString('owner');
         const agentMdHash = 'sha256:' + crypto.createHash('sha256').update(agentMd, 'utf-8').digest('hex');
         const now = Date.now();
         const identity = {
             aid: peerId,
             type,
-            isAgent,
+            isMachine,
+            isAgent: isMachine,
+            ...(exttype ? { exttype } : {}),
+            ...(owner ? { owner } : {}),
+            metadata,
             name,
             agentMdHash,
             agentMdUpdatedAt: now,
@@ -120,7 +187,7 @@ export class PeerIdentityCache {
         try {
             fs.mkdirSync(path.join(path.dirname(filePath), 'shared'), { recursive: true });
             fs.writeFileSync(filePath, JSON.stringify(identity, null, 2), 'utf-8');
-            logger.debug(`[PeerIdentityCache] Updated: ${channelType}#${peerId} type=${type} isAgent=${isAgent} source=${source}`);
+            logger.debug(`[PeerIdentityCache] Updated: ${channelType}#${peerId} type=${type} isMachine=${isMachine} source=${source}`);
         }
         catch (err) {
             logger.warn(`[PeerIdentityCache] Failed to write cache: ${filePath} err=${err}`);
@@ -146,6 +213,7 @@ export class PeerIdentityCache {
         const identity = {
             aid: peerId,
             type: 'unknown',
+            isMachine: true,
             isAgent: true,
             agentMdHash: '',
             agentMdUpdatedAt: 0,
@@ -188,6 +256,7 @@ export class PeerIdentityCache {
             return {
                 aid: '',
                 type: 'unknown',
+                isMachine: true,
                 isAgent: true,
                 agentMdHash: '',
                 agentMdUpdatedAt: 0,
@@ -212,7 +281,10 @@ export class PeerIdentityCache {
         try {
             logger.debug(`[PeerIdentityCache] Syncing agent.md: ${channelType}#${peerId}`);
             const { agentmdSync } = await import('../../aun/aid/agentmd.js');
-            const invalidated = stale?.lastCheckedAt === 0 || revision > 0;
+            // 缺 metadata 的旧快照（字段补全之前写入的）也要重写一次：
+            // 否则命中 hash 相同分支只会 touch，永远补不上 exttype/owner/metadata。
+            const invalidated = stale?.lastCheckedAt === 0 || revision > 0
+                || (!!stale && stale.source !== 'unknown' && stale.metadata === undefined);
             const result = await agentmdSync(peerId, {
                 store,
                 aunPath: resolvedAunPath,
@@ -222,7 +294,7 @@ export class PeerIdentityCache {
             if ((this.invalidationRevisions.get(cachePath) ?? 0) !== revision) {
                 // A newer event arrived during this read. Its next lookup must refresh.
                 return this.get(channelType, peerId, agentDir) ?? {
-                    aid: peerId, type: 'unknown', isAgent: true, agentMdHash: '', agentMdUpdatedAt: 0,
+                    aid: peerId, type: 'unknown', isMachine: true, isAgent: true, agentMdHash: '', agentMdUpdatedAt: 0,
                     verifiedAt: 0, lastCheckedAt: 0, source: 'unknown',
                 };
             }
@@ -241,10 +313,13 @@ export class PeerIdentityCache {
             if (!verified) {
                 logger.info(`[PeerIdentityCache] agent.md unverified for ${peerId}: status=${result.verification?.status ?? 'unknown'} reason=${result.verification?.reason ?? '-'} (type 仍按声明解析)`);
             }
-            // 3. 比较 hash，内容与可信级别都未变时仅 touch
+            // 3. 比较 hash，内容与可信级别都未变时仅 touch。
+            //    例外：旧快照若缺 metadata（字段补全之前写入），必须重写一次，
+            //    否则这里每次都走 touch，新字段永远补不上。
             const newHash = 'sha256:' + crypto.createHash('sha256').update(content, 'utf-8').digest('hex');
             const cached = this.get(channelType, peerId, agentDir);
-            if (cached && cached.agentMdHash === newHash && cached.source === source) {
+            if (cached && cached.agentMdHash === newHash && cached.source === source
+                && cached.metadata !== undefined) {
                 return this.touchLastChecked(channelType, peerId, agentDir, cached);
             }
             return this.updateFromAgentMd(channelType, peerId, agentDir, content, verified ? Date.now() : 0, source);

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

@@ -1,6 +1,6 @@
 import { normalizeSessionLoopConfig, resolveSessionLoopTarget, sessionLoopError } from './session-idle-monitor.js';
 import { ensureDir } from '../../utils/atomic-write.js';
-import { resolvePaths } from '../../paths.js';
+import { resolvePaths, agentThreadIndexPath } from '../../paths.js';
 import { logger } from '../../utils/logger.js';
 import { encodePath } from '../../utils/cross-platform.js';
 import { readRunnerEventSummary } from './runner-event-summary.js';
@@ -1555,6 +1555,20 @@ export class SessionManager {
             metaFile: `${session.id}.jsonl`,
         };
         writeThreadIndex(chatDir, threadIndex);
+        // 被动建档（收到消息时自动创建话题会话）也必须同步到 agent 级话题索引，
+        // 否则 `ec thread rename current` / list 等按索引寻址的操作会报"话题不存在"。
+        this.upsertAgentThreadIndex({
+            selfAid: selfAID ?? '',
+            threadId,
+            sessionId: session.id,
+            peer: channelId,
+            channelType: channelType ?? 'aun',
+            peerKind: effectiveChatType === 'group' ? 'group' : 'private',
+            name: session.name,
+            label: normalizeTopicLabel(label) ?? null,
+            topicStatus: session.topicStatus ?? 'pending',
+            now: session.createdAt ?? Date.now(),
+        });
         this.eventBus.publish({
             type: 'session:created',
             sessionId: session.id,
@@ -1567,6 +1581,47 @@ export class SessionManager {
         });
         return session;
     }
+    /**
+     * 把一条话题会话合并进 agent 级索引（`data/threads/index.json`）。
+     *
+     * 全局索引是 `ec thread` 各命令的寻址源；被动建档只写过 chatDir 下的
+     * `_threads/thread-index.json`，导致 `rename current` 之类找不到自己。
+     * 这里按 (peer, threadId) 幂等 upsert：已存在则只补缺失字段，不覆盖
+     * 名称/摘要等既有属性。
+     */
+    upsertAgentThreadIndex(input) {
+        if (!input.selfAid || !input.threadId)
+            return;
+        try {
+            const indexPath = agentThreadIndexPath(input.selfAid);
+            const raw = readJsonFile(indexPath);
+            const index = raw && Array.isArray(raw.threads) ? raw : { version: 1, threads: [] };
+            const existing = index.threads.find((t) => t.threadId === input.threadId
+                && String(t.peer ?? '').toLowerCase() === input.peer.toLowerCase());
+            if (existing) {
+                existing.sessionId = existing.sessionId || input.sessionId;
+                return;
+            }
+            index.threads.push({
+                threadId: input.threadId,
+                sessionId: input.sessionId,
+                peer: input.peer,
+                channelType: input.channelType,
+                peerKind: input.peerKind,
+                name: input.name || '话题会话',
+                label: input.label ?? null,
+                topicStatus: input.topicStatus,
+                createdAt: input.now,
+                lastActiveAt: input.now,
+            });
+            ensureDir(path.dirname(indexPath));
+            atomicWriteJson(indexPath, index);
+        }
+        catch (error) {
+            // 索引同步失败不能阻断消息处理：会话本身已落盘，rebuild-index 可补齐。
+            logger.warn(`[SessionManager] agent thread index upsert failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     async switchProject(channel, channelId, newProjectPath, baseagent) {
         if (!baseagent) {
             throw new Error(`[SessionManager] switchProject: baseagent is empty for channel=${channel} channelId=${channelId}`);

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

@@ -94,6 +94,31 @@ export function buildCliSessionPreview(messages, backend, options = {}) {
         : null;
     return { title, hasReal: !!summary.firstRealMessage };
 }
+/**
+ * 会话/话题名称的长度常量，自动生成与手动改名共用。
+ *
+ * - `SESSION_TITLE_MAX_LEN`（80）：正文字数，超长文本截到这里再加省略号；
+ * - `SESSION_TITLE_STORED_MAX_LEN`（83）：落盘上限 = 80 + `...`。
+ *
+ * 80~83 字符的名字本身就是合法落盘形态，不再二次截断——
+ * 否则「系统自动生成的名字」会变成改一次短一点。
+ */
+export const SESSION_TITLE_MAX_LEN = 80;
+export const SESSION_TITLE_ELLIPSIS = '...';
+/** 落盘名称的硬上限（截断后的最长长度）。 */
+export const SESSION_TITLE_STORED_MAX_LEN = SESSION_TITLE_MAX_LEN + SESSION_TITLE_ELLIPSIS.length;
+/**
+ * 截断到落盘上限并补省略号；未超长时原样返回。
+ *
+ * 判据是 `SESSION_TITLE_STORED_MAX_LEN`（83）而不是正文上限（80）：
+ * 80~83 字符的名称本来就是合法落盘形态（含历史遗留），截断它们会把
+ * 「系统生成的名字原样改回去」变成「改一次短一点」。
+ */
+export function truncateSessionTitle(title) {
+    return title.length > SESSION_TITLE_STORED_MAX_LEN
+        ? `${title.slice(0, SESSION_TITLE_MAX_LEN)}${SESSION_TITLE_ELLIPSIS}`
+        : title;
+}
 export function sanitizeSessionTitle(title) {
     if (typeof title !== 'string')
         return undefined;
@@ -109,7 +134,7 @@ export function sanitizeSessionTitle(title) {
         return undefined;
     if (/^\.+$/.test(cleanTitle))
         return undefined;
-    return cleanTitle.length > 80 ? `${cleanTitle.slice(0, 80)}...` : cleanTitle;
+    return truncateSessionTitle(cleanTitle);
 }
 export function displaySessionTitle(title, fallback = '默认会话') {
     return sanitizeSessionTitle(title) || sanitizeSessionTitle(fallback) || fallback;