evolcore 0.0.33 → 0.0.35-test.0

package/dist/agents/ecagent-runner.js

@@ -10,7 +10,7 @@ import { DEFAULT_PERMISSION_MODE } from '../types.js';
 import { agentSessionsDir, resolveRoot } from '../paths.js';
 import { requestDangerousCommandPermission } from '../core/permission/approval-gateway.js';
 import { normalizeExecutionPermissionMode, normalizePermissionMode } from '../core/permission/mode.js';
-import { checkDangerousCommand, checkReadonly, evaluateToolPreflight } from '../core/permission/tool-policy.js';
+import { checkBashDescription, checkDangerousCommand, checkReadonly, evaluateToolPreflight } from '../core/permission/tool-policy.js';
 import { logger } from '../utils/logger.js';
 import { ErrorType } from '../utils/error-utils.js';
 import { summarizeToolInputForAudit } from '../utils/tool-summary.js';
@@ -18,6 +18,7 @@ import { auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
 import { resolveEcagentConfig } from './baseagent.js';
 import { buildModelRequestHeaders } from './request-identity.js';
 import { appendRequestPath } from './request-identity.js';
+import { resolveModelSpec } from '../stats/billing.js';
 import { getManagedTaskTempDir } from '../cli/task-context.js';
 import { unsettledInterruptError, withInterruptDeadline, hasTrustedFullAccessContext } from './runner-types.js';
 const PROVIDER_ID = 'evolcore-gateway';
@@ -436,18 +437,23 @@ async function consumeOpenAiStream(output, body, model) {
     throw new Error('[network] Gateway stream ended without a terminal event');
 }
 function createModel(id, baseUrl) {
-    const isClaude = id.toLowerCase().startsWith('claude-');
+    const modelId = stripContextWindowSuffix(id);
+    const isClaude = modelId.toLowerCase().startsWith('claude-');
+    const fallback = isClaude
+        ? { context_window: 200_000, max_output_tokens: 8_192 }
+        : { context_window: 128_000, max_output_tokens: 16_384 };
+    const spec = resolveModelSpec(resolveRoot(), id, undefined, fallback);
     return {
-        id,
-        name: id,
+        id: modelId,
+        name: modelId,
         api: 'openai-completions',
         provider: PROVIDER_ID,
         baseUrl,
         reasoning: true,
         input: ['text', 'image'],
         cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-        contextWindow: isClaude ? 200_000 : 128_000,
-        maxTokens: isClaude ? 8_192 : 16_384,
+        contextWindow: spec.context_window,
+        maxTokens: spec.max_output_tokens,
         compat: {
             maxTokensField: 'max_tokens',
             supportsUsageInStreaming: true,
@@ -464,7 +470,11 @@ function isWithin(root, candidate) {
     const relative = path.relative(root, candidate);
     return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
 }
-export function resolveEcagentToolPath(projectPath, candidate, forWrite = false, bootstrapAgentMdPath, fullaccess = false, personalMdPath) {
+/** 路径是否落在任一显式声明的根之下（含根本身）。 */
+function isWithinAny(candidate, roots) {
+    return roots.some(root => isWithin(path.resolve(root), candidate));
+}
+export function resolveEcagentToolPath(projectPath, candidate, forWrite = false, bootstrapAgentMdPath, fullaccess = false, personalMdPath, sessionGrants) {
     const root = fs.realpathSync(projectPath);
     const resolved = path.resolve(root, candidate || '.');
     const allowedBootstrapFile = bootstrapAgentMdPath
@@ -472,7 +482,15 @@ export function resolveEcagentToolPath(projectPath, candidate, forWrite = false,
         : undefined;
     const allowedPersonalFile = personalMdPath ? path.resolve(personalMdPath) : undefined;
     const isManagedIdentityFile = resolved === allowedBootstrapFile || resolved === allowedPersonalFile;
-    if (!fullaccess && !isWithin(root, resolved) && !isManagedIdentityFile) {
+    // 系统会话：模块声明的可读根整体放行，可写文件逐个精确匹配（不含目录）。
+    // 声明之外、项目之外的路径仍然拒绝。声明里的路径可能在多个根之间借符号链接互串，
+    // 所以放行前统一按真实路径复核，确认真实位置仍落在同一个被授予的边界内。
+    // 写只看可写文件（逐个精确匹配），绝不由可读根推导；读只看可读根。
+    const sessionWrites = forWrite && (sessionGrants?.writeFiles ?? [])
+        .some(file => path.resolve(file) === resolved);
+    const sessionReads = !forWrite && isWithinAny(resolved, sessionGrants?.readRoots ?? []);
+    const isSessionTarget = sessionReads || sessionWrites;
+    if (!fullaccess && !isWithin(root, resolved) && !isManagedIdentityFile && !isSessionTarget) {
         throw new Error(`Path is outside the project: ${candidate}`);
     }
     if (isManagedIdentityFile) {
@@ -494,7 +512,34 @@ export function resolveEcagentToolPath(projectPath, candidate, forWrite = false,
     while (!fs.existsSync(cursor) && cursor !== path.dirname(cursor))
         cursor = path.dirname(cursor);
     const canonical = fs.realpathSync(cursor);
-    if (!fullaccess && !isWithin(root, canonical))
+    if (fullaccess)
+        return resolved;
+    // 系统会话的写入目标与判定层一致：必须是普通文件，链接一律拒绝。
+    // 链接会让 resolved 与真实位置分离，放行等于把洞开到声明之外。
+    if (sessionWrites && fs.existsSync(resolved) && fs.lstatSync(resolved).isSymbolicLink()) {
+        throw new Error(`Refusing to write through a symbolic link: ${candidate}`);
+    }
+    // 可写文件尚未创建时，以父目录的真实路径为准；已存在时以文件自身的真实路径为准。
+    const canonicalSelf = fs.existsSync(resolved) ? fs.realpathSync(resolved) : canonical;
+    if (isSessionTarget) {
+        const grantedRoots = [
+            ...(sessionReads ? sessionGrants?.readRoots ?? [] : []),
+            ...(sessionWrites ? (sessionGrants?.writeFiles ?? []).filter(file => path.resolve(file) === resolved) : []),
+        ];
+        const canonicalRoots = grantedRoots.flatMap(granted => {
+            const inside = fs.existsSync(granted) ? [fs.realpathSync(granted)] : [];
+            // 根自身可能尚未创建，或者位于尚未创建的上层目录中；先归到存在的祖先再比。
+            let ancestor = granted;
+            while (!fs.existsSync(ancestor) && ancestor !== path.dirname(ancestor))
+                ancestor = path.dirname(ancestor);
+            return [...inside, fs.realpathSync(ancestor)];
+        });
+        if (!canonicalRoots.some(granted => isWithin(granted, canonical) && isWithin(granted, canonicalSelf))) {
+            throw new Error(`Path resolves outside its declared grant: ${candidate}`);
+        }
+        return resolved;
+    }
+    if (!isWithin(root, canonical))
         throw new Error(`Path resolves outside the project: ${candidate}`);
     return resolved;
 }
@@ -547,7 +592,7 @@ async function walkFiles(root, signal) {
 function textResult(text, details = {}) {
     return { content: [{ type: 'text', text: truncate(text) }], details };
 }
-function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullaccess = false, personalMdPath) {
+function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullaccess = false, personalMdPath, sessionGrants) {
     const read = {
         name: 'Read', label: 'Read', description: 'Read a UTF-8 text file from the project.',
         parameters: Type.Object({
@@ -556,7 +601,7 @@ function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullacc
             limit: Type.Optional(Type.Number({ minimum: 1 })),
         }),
         async execute(_id, params, signal) {
-            const file = resolveEcagentToolPath(projectPath, params.file_path, false, bootstrapAgentMdPath, fullaccess, personalMdPath);
+            const file = resolveEcagentToolPath(projectPath, params.file_path, false, bootstrapAgentMdPath, fullaccess, personalMdPath, sessionGrants);
             const stat = await fs.promises.stat(file);
             if (stat.size > MAX_READ_BYTES)
                 throw new Error(`File exceeds ${MAX_READ_BYTES} byte read limit`);
@@ -573,7 +618,7 @@ function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullacc
         name: 'Glob', label: 'Glob', description: 'Find project files matching a glob pattern.',
         parameters: Type.Object({ pattern: Type.String(), path: Type.Optional(Type.String()) }),
         async execute(_id, params, signal) {
-            const root = resolveEcagentToolPath(projectPath, params.path ?? '.', false, undefined, fullaccess);
+            const root = resolveEcagentToolPath(projectPath, params.path ?? '.', false, undefined, fullaccess, undefined, sessionGrants);
             const matcher = globRegex(params.pattern.replaceAll('\\', '/'));
             const files = (await walkFiles(root, signal))
                 .map(file => path.relative(root, file).replaceAll(path.sep, '/'))
@@ -589,7 +634,7 @@ function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullacc
             case_insensitive: Type.Optional(Type.Boolean()), literal: Type.Optional(Type.Boolean()),
         }),
         async execute(_id, params, signal) {
-            const root = resolveEcagentToolPath(projectPath, params.path ?? '.', false, undefined, fullaccess);
+            const root = resolveEcagentToolPath(projectPath, params.path ?? '.', false, undefined, fullaccess, undefined, sessionGrants);
             const files = (await fs.promises.stat(root)).isFile() ? [root] : await walkFiles(root, signal);
             const fileMatcher = params.glob ? globRegex(params.glob.replaceAll('\\', '/')) : undefined;
             const flags = params.case_insensitive ? 'i' : '';
@@ -622,7 +667,7 @@ function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullacc
         name: 'Write', label: 'Write', description: 'Create or completely overwrite a project file.',
         parameters: Type.Object({ file_path: Type.String(), content: Type.String() }), executionMode: 'sequential',
         async execute(_id, params, signal) {
-            const file = resolveEcagentToolPath(projectPath, params.file_path, true, bootstrapAgentMdPath, fullaccess, personalMdPath);
+            const file = resolveEcagentToolPath(projectPath, params.file_path, true, bootstrapAgentMdPath, fullaccess, personalMdPath, sessionGrants);
             await fs.promises.mkdir(path.dirname(file), { recursive: true });
             await fs.promises.writeFile(file, params.content, { encoding: 'utf8', signal });
             return textResult(`Wrote ${Buffer.byteLength(params.content)} bytes to ${path.relative(projectPath, file)}`, { file });
@@ -635,7 +680,7 @@ function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullacc
             replace_all: Type.Optional(Type.Boolean()),
         }), executionMode: 'sequential',
         async execute(_id, params, signal) {
-            const file = resolveEcagentToolPath(projectPath, params.file_path, false, bootstrapAgentMdPath, fullaccess, personalMdPath);
+            const file = resolveEcagentToolPath(projectPath, params.file_path, true, bootstrapAgentMdPath, fullaccess, personalMdPath, sessionGrants);
             const value = await fs.promises.readFile(file, { encoding: 'utf8', signal });
             if (!params.old_string)
                 throw new Error('old_string must not be empty');
@@ -655,7 +700,7 @@ function createTools(env, projectPath, runtimeEnv, bootstrapAgentMdPath, fullacc
         name: 'Bash', label: 'Bash', description: 'Run a shell command in the project.',
         parameters: Type.Object({
             command: Type.String(), timeout: Type.Optional(Type.Number({ minimum: 1, maximum: 600_000 })),
-            description: Type.Optional(Type.String()),
+            description: Type.Optional(Type.String({ description: '<命令目标描述> [<风险等级>]，风险等级为 低/中/高 之一，例如 "查看工作区未提交的改动 [低]"。缺失或格式不符时调用被拒。' })),
         }), executionMode: 'sequential',
         async execute(_id, params, signal) {
             const result = await env.exec(params.command, {
@@ -724,7 +769,7 @@ export class EcagentRunner {
                 configuredHeaders: config.headers,
             }),
         };
-        this.model = stripContextWindowSuffix(config.model);
+        this.model = config.model;
         this.effort = config.effort;
         this.agentAid = runtime?.agentAid;
         this.onSessionIdUpdate = callbacks?.onSessionIdUpdate;
@@ -734,8 +779,8 @@ export class EcagentRunner {
             throw new Error('ecagent requires an EvolCore Agent AID');
         return agentSessionsDir(this.agentAid);
     }
-    setModel(model) { this.model = stripContextWindowSuffix(model); }
-    getModel() { return this.model; }
+    setModel(model) { this.model = model; }
+    getModel() { return stripContextWindowSuffix(this.model); }
     resolveModelId(model) { return model; }
     setEffort(effort) { this.effort = effort; }
     getEffort() { return this.effort; }
@@ -885,7 +930,7 @@ export class EcagentRunner {
                 models,
                 model,
                 thinkingLevel: normalizeThinkingLevel(effort),
-                tools: createTools(nodeEnv, request.projectPath, request.runtimeEnv, request.modelOverride?.bootstrapAgentMdPath, fullaccess, request.modelOverride?.personalMdPath),
+                tools: createTools(nodeEnv, request.projectPath, request.runtimeEnv, request.modelOverride?.bootstrapAgentMdPath, fullaccess, request.modelOverride?.personalMdPath, this.permissionContexts.get(request.sessionId)?.systemSessionGrants),
                 systemPrompt: [DEFAULT_SYSTEM_PROMPT, request.systemPromptAppend].filter(Boolean).join('\n\n'),
                 streamOptions: {
                     timeoutMs: this.config.timeoutMs,
@@ -1169,11 +1214,6 @@ export class EcagentRunner {
     }
     async authorizeTool(sessionId, projectPath, mode, toolName, input, turn) {
         const permissionContext = this.permissionContexts.get(sessionId);
-        if (mode === 'fullaccess') {
-            return hasTrustedFullAccessContext(permissionContext)
-                ? {}
-                : { block: true, reason: 'Untrusted fullaccess execution context' };
-        }
         const recordBlockedOperation = async (policyCode, operationInput = input, matchedPath) => {
             const summary = summarizeToolInputForAudit(toolName, operationInput).slice(0, 512);
             auditToolPreflightDenial({
@@ -1212,6 +1252,29 @@ export class EcagentRunner {
                 logger.warn(`[EcagentRunner] failed to record blocked operation: session=${sessionId} tool=${toolName} code=${policyCode} error=${error instanceof Error ? error.message : String(error)}`);
             }
         };
+        // Bash description 格式约定先于一切放行分支（含 fullaccess 与系统会话）。
+        // TODO(bash-description): 与 claude-runner 同因——该约束缺少验证，先短路放行；
+        // 恢复强制时把两个 runner 的开关一起打开。
+        if (process.env.EVOLCORE_BASH_DESCRIPTION_ENFORCE === '1') {
+            const descriptionCheck = checkBashDescription(toolName, input);
+            if (descriptionCheck) {
+                await recordBlockedOperation(descriptionCheck.policyCode);
+                return { block: true, reason: descriptionCheck.message };
+            }
+        }
+        if (mode === 'fullaccess') {
+            return hasTrustedFullAccessContext(permissionContext)
+                ? {}
+                : { block: true, reason: 'Untrusted fullaccess execution context' };
+        }
+        // 系统会话：模块判定即最终结论，不进入 preflight / permissionMode 分支
+        if (permissionContext?.systemSessionCheck) {
+            const decision = permissionContext.systemSessionCheck(toolName, input);
+            if (decision.allow)
+                return {};
+            await recordBlockedOperation(decision.code);
+            return { block: true, reason: decision.reason };
+        }
         const policy = permissionContext?.policyHook?.(toolName, input, { turn });
         if (policy?.block) {
             await recordBlockedOperation(policy.policyCode ?? 'session_policy_hook');
@@ -1239,7 +1302,7 @@ export class EcagentRunner {
         const checkedInput = preflight.input;
         if (mode === 'readonly') {
             const decision = checkReadonly(toolName, checkedInput, projectPath, {
-                sessionId, managedTempDir: permissionContext?.managedTempDir, channel: permissionContext?.channel, peerId: permissionContext?.userId, role: permissionContext?.role,
+                sessionId, managedTempDir: permissionContext?.managedTempDir, grantedReadRoots: permissionContext?.grantedReadRoots, channel: permissionContext?.channel, peerId: permissionContext?.userId, role: permissionContext?.role,
                 allowReadonlySourceDiagnostics: permissionContext?.allowReadonlySourceDiagnostics === true,
             });
             if (decision.behavior === 'deny') {
@@ -1351,7 +1414,7 @@ export class EcagentRunner {
                 ? cached
                 : await this.openExistingRuntime(agentSessionId, cwd);
             this.onCompactStart?.(sessionId);
-            const compactModel = stripContextWindowSuffix(modelOverride?.model || this.model);
+            const compactModel = modelOverride?.model || this.model;
             const compactEffort = modelOverride?.effortMode === 'model_default'
                 ? undefined
                 : modelOverride?.effort ?? this.effort;

package/dist/agents/runner-types.js

@@ -136,10 +136,9 @@ export function isOneMillionContextModel(model) {
     return ONE_M_CONTEXT_MODEL_PREFIXES.some(prefix => base === prefix || base.startsWith(`${prefix}-`));
 }
 /**
- * EvolCore's conservative local context-window catalog: 1M models = 1,000,000;
- * every other model falls back to 200,000 until provider metadata is available.
- * This is an operational guardrail, not a claim about an upstream provider's
- * advertised capacity.
+ * Hardcoded context-window fallback for models missing from the parameter table:
+ * known 1M models use 1,000,000; every other model falls back to 200,000.
+ * This is an operational guardrail, not a claim about advertised capacity.
  */
 export function realContextWindowForModel(model) {
     return isOneMillionContextModel(model) ? 1000000 : 200000;
@@ -159,8 +158,8 @@ export function autoCompactWindowForModel(_model) {
  * at the right point for small-context models (200k/128k), where EvolCore's
  * fixed 650k threshold would never trigger.
  */
-export function sdkAutoCompactWindowForModel(model) {
-    const contextWindow = realContextWindowForModel(model);
+export function sdkAutoCompactWindowForModel(model, resolvedContextWindow) {
+    const contextWindow = resolvedContextWindow ?? realContextWindowForModel(model);
     const reserve = Math.min(10_000, Math.floor(contextWindow * 0.05));
     return Math.min(650_000, Math.max(1, contextWindow - reserve));
 }

package/dist/aun/aid/agentmd.js

@@ -179,8 +179,19 @@ export function parseAgentDisplayName(content) {
     const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/)?.[1];
     if (!frontmatter)
         return undefined;
-    const name = frontmatter.match(/^name:\s*["']?(.+?)["']?\s*$/m)?.[1]?.trim();
-    return name || undefined;
+    try {
+        const document = parseDocument(frontmatter);
+        if (document.errors.length > 0)
+            return undefined;
+        const fields = document.toJS();
+        if (!fields || typeof fields !== 'object' || Array.isArray(fields))
+            return undefined;
+        const name = fields.name;
+        return typeof name === 'string' ? name.trim() || undefined : undefined;
+    }
+    catch {
+        return undefined;
+    }
 }
 function displayNameKey(aid, aunPath) {
     const root = path.resolve(aunPath ?? resolveRoot());

package/dist/aun/aid/client.js

@@ -39,7 +39,7 @@ export function suppressSdkLogs() {
     };
 }
 // ==================== SDK package ====================
-export const MIN_AUN_CORE_SDK = [0, 5, 17];
+export const MIN_AUN_CORE_SDK = [0, 5, 20];
 export const AUN_CORE_SDK_PKG = '@agentunion/fastaun';
 function compareVersion(a, min) {
     const parts = a.split('.').map(n => parseInt(n, 10));

package/dist/aun/aid/identity.js

@@ -224,7 +224,7 @@ export async function aidCreate(aid, opts) {
     // 新注册流程：AIDStore.register → downloadCaRoot → load → authenticate
     const store = await getAidStore({ slotId: SLOT.cli, aunPath });
     try {
-        const regResult = await store.register(aid);
+        const regResult = await store.register(aid, { type: 'agent' });
         if (!regResult.ok) {
             const e = new Error(regResult.error.message);
             e.code = regResult.error.code;

package/dist/aun/msg/managed-operation.js

@@ -597,6 +597,9 @@ export class ManagedMsgOperationError extends Error {
 }
 const HISTORY_VALUE_FLAGS = new Set([
     '--session', '--limit', '--before', '--after', '--direction', '--format', '--channel-key', '--peer-id',
+    // 话题过滤是托管协作的常规用法（文档 `thread-chain.md` 明确写了
+    // `ec msg history --thread <id>`）；只会收窄结果集，不扩大可读范围。
+    '--thread',
 ]);
 function failMsg(code, reason) {
     return { ok: false, code, reason };
@@ -720,6 +723,15 @@ export function resolveManagedMsgOperation(argv) {
         return failMsg('INVALID_ARGUMENT', '--after must be earlier than --before');
     }
     const target = channelKey === undefined ? String(positionals[0] || '').replace(/^@/, '') : undefined;
+    const threadId = values.get('--thread');
+    if (threadId !== undefined) {
+        if (kind !== 'history')
+            return failMsg('INVALID_ARGUMENT', '--thread is only supported for history');
+        if (channelKey !== undefined)
+            return failMsg('INVALID_ARGUMENT', '--thread cannot be combined with --channel-key/--peer-id');
+        if (!/^thread-[A-Za-z0-9][A-Za-z0-9_.-]*$/.test(threadId))
+            return failMsg('INVALID_ARGUMENT', 'invalid --thread id');
+    }
     const canonicalArgv = ['msg', kind, from];
     if (target !== undefined)
         canonicalArgv.push(target);
@@ -735,6 +747,8 @@ export function resolveManagedMsgOperation(argv) {
         canonicalArgv.push('--after', values.get('--after'));
     if (values.has('--direction'))
         canonicalArgv.push('--direction', values.get('--direction'));
+    if (threadId !== undefined)
+        canonicalArgv.push('--thread', threadId);
     return {
         ok: true,
         command: {
@@ -749,6 +763,7 @@ export function resolveManagedMsgOperation(argv) {
             before,
             after,
             direction,
+            ...(threadId !== undefined ? { threadId } : {}),
         },
     };
 }
@@ -766,6 +781,7 @@ export async function executeManagedMsgOperation(command) {
             before: command.before,
             after: command.after,
             direction: command.direction,
+            threadId: command.threadId,
         })
         : await msgOnline({
             from: command.from,

package/dist/aun/msg/p2p.js

@@ -279,8 +279,24 @@ export async function msgSend(args) {
             catch { /* ignore */ }
         }
         // 2. 决定 chatmode（遵循来源1-3）
-        // 私聊：非 human 对端 → proactive，human 对端 → interactive
-        const chatmode = peerIdentity.isAgent ? 'proactive' : 'interactive';
+        // 私聊：非 human 对端 → proactive；人类对端只有 owner/admin 才 interactive，
+        // 其余（含角色未知）按 proactive 保守处理。判定逻辑集中在 peer-mode。
+        const { chatmodeForPeerIdentity } = await import('../../core/message/peer-mode.js');
+        const { resolvePeerRoleDetail } = await import('../../config/peer-role-resolver.js');
+        let peerRole = null;
+        try {
+            peerRole = resolvePeerRoleDetail({
+                selfAid: args.from,
+                channelKey: `aun#${args.from}#main`,
+                channelType: 'aun',
+                chatType: 'private',
+                actorId: args.to,
+                conversationId: args.to,
+                peerType: peerIdentity.type,
+            }).effectiveRole;
+        }
+        catch { /* 角色解析失败时按未知处理（proactive） */ }
+        const chatmode = chatmodeForPeerIdentity(peerIdentity, peerRole);
         // 3. 构建 payload
         if (!payload) {
             payload = buildSimplePayload(args.body);

package/dist/channels/aun.js

@@ -557,6 +557,24 @@ function setIfDefined(target, key, value) {
     if (value !== undefined)
         target[key] = value;
 }
+function truncateRawErrorForDisplay(raw) {
+    if (typeof raw !== 'string' || !raw.trim())
+        return undefined;
+    const text = raw.trim();
+    const htmlStart = text.toLowerCase().indexOf('<html');
+    return htmlStart >= 0 ? text.slice(0, htmlStart).trimEnd() : text;
+}
+function projectedRawError(raw, displayRaw) {
+    if (typeof raw !== 'string')
+        return raw;
+    return raw.trim() ? displayRaw : raw;
+}
+function appendRawErrorText(text, raw) {
+    const displayRaw = truncateRawErrorForDisplay(raw);
+    if (!displayRaw || text.includes(displayRaw))
+        return text;
+    return `${text}\n原因：${displayRaw}`;
+}
 /**
  * 把 AUNChannel 投递的 opts 映射成渠道无关的 InboundMessage。
  *
@@ -662,6 +680,8 @@ export class AUNChannel {
     traceWriter = null;
     eventBus = null;
     queuedHandler = null;
+    /** `topic-renamed` 消费器，由 runtime 注入（见 setThreadRenameHandler）。 */
+    threadRenameHandler = null;
     groupInviteHandler;
     groupInviteConnectedHandler;
     groupInviteDeliveryGate;
@@ -1391,6 +1411,44 @@ export class AUNChannel {
             return sanitized;
         return undefined;
     }
+    /**
+     * 处理对端 `topic-renamed` 通知：校验字段后交给注入的改名消费器落索引，
+     * 成功后发 `thread:renamed` 让前端刷新。全程不进入 Agent 消息队列。
+     * 通知是尽力而为的，任何失败只记日志，不影响后续消息处理。
+     */
+    applyInboundTopicRename(params) {
+        const payload = params.payload && typeof params.payload === 'object' ? params.payload : null;
+        const threadId = typeof payload?.threadId === 'string' ? payload.threadId : undefined;
+        const name = this.sanitizeTopicName(payload?.topicName);
+        const nameUpdatedAt = typeof payload?.nameUpdatedAt === 'number' && Number.isFinite(payload.nameUpdatedAt)
+            ? payload.nameUpdatedAt : undefined;
+        const applier = this.threadRenameHandler;
+        if (!applier || !threadId || !name || nameUpdatedAt === undefined || !params.peer) {
+            logger.debug(`${this.logPrefix()} topic-renamed ignored: peer=${params.peer || '<none>'} thread=${threadId || '<none>'} hasName=${!!name}`);
+            return;
+        }
+        void applier({
+            selfAid: params.selfAid, peer: params.peer, peerKind: params.peerKind,
+            threadId, name, nameUpdatedAt,
+        }).then(result => {
+            if (!result.applied) {
+                logger.debug(`${this.logPrefix()} topic-renamed not applied (${result.reason ?? 'unknown'}): thread=${threadId}`);
+                return;
+            }
+            this.eventBus?.publish?.({
+                type: 'thread:renamed',
+                sessionId: result.sessionId,
+                peer: params.peer,
+                threadId,
+                name,
+                nameUpdatedAt,
+                by: params.senderAid ?? '',
+            });
+            logger.info(`${this.logPrefix()} topic-renamed applied: thread=${threadId} name=${JSON.stringify(name)}`);
+        }).catch(error => {
+            logger.warn(`${this.logPrefix()} topic-renamed failed: ${error instanceof Error ? error.message : String(error)}`);
+        });
+    }
     buildGroupReplyContext(threadId, senderAid, encrypted, messageId, chatmode, topicName, groupId, label, topicStatus) {
         if (!groupId)
             throw new Error('buildGroupReplyContext requires groupId');
@@ -2519,6 +2577,14 @@ export class AUNChannel {
         if (p2pPayloadType === 'text') {
             import('../utils/msg-diag.js').then(m => m.diagLog('aun_in', { aid: this.config.aid, from: fromAid, to: this.config.aid, msgId: messageId, text })).catch(() => { });
         }
+        // topic-renamed：对端话题改名通知。只更新本端话题索引，不进 Agent 队列。
+        if (p2pPayloadType === 'topic-renamed') {
+            this.applyInboundTopicRename({
+                payload, selfAid: this.config.aid, peer: fromAid, peerKind: 'private',
+                senderAid: fromAid,
+            });
+            return;
+        }
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (p2pPayloadType === 'action_card_reply') {
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId, receivedAt, seq);
@@ -2650,6 +2716,14 @@ export class AUNChannel {
             logger.debug(`${this.logPrefix()} Group dropped observer control envelope: mid=${messageId}`);
             return;
         }
+        // topic-renamed：群内话题改名通知。只更新本端索引，不进 Agent 队列。
+        if (inboundType === 'topic-renamed') {
+            this.applyInboundTopicRename({
+                payload, selfAid: this.config.aid, peer: groupId || senderAid, peerKind: 'group',
+                senderAid,
+            });
+            return;
+        }
         const payloadMentionEntries = this.parsePayloadMentionsOrReject(payload, 'group.inbound', messageId);
         if (!payloadMentionEntries)
             return;
@@ -3760,6 +3834,13 @@ export class AUNChannel {
         }, delayMs);
     }
     // ── Public API (same interface as before) ───────────────────
+    /**
+     * 对端发来的话题改名通知（`topic-renamed`）。由 runtime 注入，交给
+     * ThreadService.applyRemoteRename 落本地索引；不进入 Agent 消息队列。
+     */
+    setThreadRenameHandler(handler) {
+        this.threadRenameHandler = handler;
+    }
     setEventBus(bus) {
         // 重新订阅前先解掉旧的——避免 reload/重连后 listener 累积
         if (this.eventBus && this.queuedHandler && typeof this.eventBus.unsubscribe === 'function') {
@@ -4606,7 +4687,23 @@ export class AUNChannel {
             return { ok: false, error: 'AUN channel is not connected', code: 'AUN_NOT_CONNECTED' };
         }
         const info = await this.fetchPeerInfo(args.to);
-        const chatmode = info.type === 'human' ? 'interactive' : 'proactive';
+        // 与 p2p 发送路径共用同一判定：非人类 → proactive；人类需 owner/admin 才 interactive。
+        const { chatmodeForPeerIdentity } = await import('../core/message/peer-mode.js');
+        let peerRole = null;
+        try {
+            const { resolvePeerRoleDetail } = await import('../config/peer-role-resolver.js');
+            peerRole = resolvePeerRoleDetail({
+                selfAid: this.config.aid,
+                channelKey: `aun#${this.config.aid}#main`,
+                channelType: 'aun',
+                chatType: 'private',
+                actorId: args.to,
+                conversationId: args.to,
+                peerType: info.type ?? undefined,
+            }).effectiveRole;
+        }
+        catch { /* 角色解析失败按未知处理 */ }
+        const chatmode = chatmodeForPeerIdentity({ isMachine: info.type !== 'human', type: info.type ?? undefined }, peerRole);
         if (!finalPayload.chatmode)
             finalPayload.chatmode = chatmode;
         const parentCausation = normalizeCausation(args.causation);
@@ -6415,32 +6512,41 @@ export class AUNChannelPlugin {
                             text: payload.text,
                             severity: 'info',
                         };
+                        setIfDefined(noticePayload, 'raw', payload.raw);
                         setIfDefined(noticePayload, 'subtype', payload.subtype);
                         await channel.sendReliableStructured(channelId, noticePayload, replyCtx, payload.text);
                         return;
                     }
                     case 'system.error': {
+                        const raw = truncateRawErrorForDisplay(payload.raw);
+                        const projectedRaw = projectedRawError(payload.raw, raw);
                         const errorPayload = {
                             type: payload.recoverable === true ? 'notice' : 'error',
                             ...taskBase(),
                             subtype: payload.subtype,
-                            text: payload.text,
+                            text: payload.recoverable === true
+                                ? payload.text
+                                : appendRawErrorText(payload.text, raw),
+                            ...(projectedRaw !== undefined ? { raw: projectedRaw } : {}),
+                            ...(payload.reason !== undefined ? { reason: payload.reason } : {}),
                             ...(payload.recoverable === true
                                 ? { severity: 'warn' }
-                                : { message: payload.text, user_message: payload.text, recoverable: false }),
+                                : { recoverable: false }),
                         };
                         await channel.sendReliableStructured(channelId, errorPayload, { ...(replyCtx ?? {}), suppressPeerMention: true }, payload.text);
                         return;
                     }
                     case 'result.error': {
+                        const raw = truncateRawErrorForDisplay(payload.raw);
+                        const projectedRaw = projectedRawError(payload.raw, raw);
                         const errorPayload = {
                             type: 'error',
                             ...taskBase(),
-                            reason: payload.reason,
-                            text: payload.text,
-                            message: payload.text,
-                            user_message: payload.text,
+                            text: appendRawErrorText(payload.text, raw),
                         };
+                        setIfDefined(errorPayload, 'subtype', payload.subtype);
+                        setIfDefined(errorPayload, 'reason', payload.reason);
+                        setIfDefined(errorPayload, 'raw', projectedRaw);
                         await channel.sendReliableStructured(channelId, errorPayload, { ...(replyCtx ?? {}), suppressPeerMention: true }, payload.text);
                         return;
                     }
@@ -6766,6 +6872,16 @@ export class AUNChannelPlugin {
             },
             registerHooks(hookCtx) {
                 channel.setEventBus(hookCtx.eventBus);
+                // 话题改名通知消费器：直接改本端索引，不经过 Agent 队列。
+                channel.setThreadRenameHandler(async (input) => {
+                    const { ThreadService } = await import('../core/thread/thread-service.js');
+                    const service = new ThreadService(hookCtx.sessionManager);
+                    const result = await service.applyRemoteRename(input);
+                    const session = result.applied
+                        ? service.findInIndex(input.selfAid, input.peer, input.threadId)?.sessionId
+                        : undefined;
+                    return { applied: result.applied, reason: result.reason, sessionId: session };
+                });
                 if (channel.setOnChannelDown) {
                     channel.setOnChannelDown(() => {
                         hookCtx.eventBus.publish({