evolcore 0.0.4 → 0.0.6

package/dist/config/gateway-config.js

@@ -15,16 +15,17 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { saveDefaultsSafe, saveAgent } from '../config-store.js';
-import { resolveAnthropicConfig, resolveOpenaiConfig } from '../agents/baseagent.js';
+import { resolveAnthropicConfig, resolveEcagentConfig, resolveOpenaiConfig } from '../agents/baseagent.js';
 import { resolvePriceRow } from '../stats/billing.js';
 import { ipcQuery } from '../ipc.js';
 import { logger } from '../utils/logger.js';
 /** 已知 baseagent 类型（网关可管理范围）。 */
-const GATEWAY_TYPES = ['claude', 'codex', 'gemini'];
+const GATEWAY_TYPES = ['claude', 'codex', 'gemini', 'ecagent'];
 const DISPLAY_NAMES = {
     claude: 'Claude',
     codex: 'Codex (OpenAI)',
     gemini: 'Gemini',
+    ecagent: 'ecagent (EvolCore)',
 };
 // ── 掩码 ──
 const ENV_PREFIX = '$ENV:';
@@ -362,7 +363,7 @@ function buildPatch(type, patch) {
         else
             return { error: 'apiKey 仅接受 "$ENV:NAME" 环境变量引用，不接受明文' };
     }
-    if (type === 'claude' || type === 'codex') {
+    if (type === 'claude' || type === 'codex' || type === 'ecagent') {
         if (patch.effort !== undefined)
             f.effort = String(patch.effort).trim() || undefined;
     }
@@ -383,6 +384,16 @@ function buildPatch(type, patch) {
         if (patch.location !== undefined)
             f.location = String(patch.location).trim() || undefined;
     }
+    if (type === 'ecagent') {
+        for (const key of ['timeoutMs', 'maxRetries', 'maxRetryDelayMs']) {
+            if (patch[key] !== undefined) {
+                const value = Number(patch[key]);
+                if (!Number.isFinite(value) || value < 0)
+                    return { error: `${key} 必须是非负数字` };
+                f[key] = value;
+            }
+        }
+    }
     return { fields: f };
 }
 /** 触发 reload：defaults 改动影响全部 agent（resync），单 agent 改动只 reload 它。 */
@@ -485,6 +496,10 @@ function resolveGatewayCreds(scope, type) {
             const r = resolveAnthropicConfig(synth, expanded);
             return { baseUrl: r.baseUrl, apiKey: r.apiKey };
         }
+        else if (type === 'ecagent') {
+            const r = resolveEcagentConfig(synth, expanded);
+            return { baseUrl: r.baseUrl, apiKey: r.apiKey };
+        }
         return { error: 'gemini 暂不支持 HTTP 探测（CLI 后端）', code: 'NOT_SUPPORTED' };
     }
     catch (e) {
@@ -507,7 +522,9 @@ export async function gatewayTest(args) {
     try {
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), 5000);
-        const resp = await fetch(`${baseUrl.replace(/\/+$/, '')}/v1/models`, {
+        const base = baseUrl.replace(/\/+$/, '');
+        const modelsUrl = base.endsWith('/v1') ? `${base}/models` : `${base}/v1/models`;
+        const resp = await fetch(modelsUrl, {
             headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
             signal: controller.signal,
         });

package/dist/config/resolved-config-op.js

@@ -110,6 +110,16 @@ function resolveFieldCommand(argv, subcommand, options = {}) {
             reason: 'Agent role policies are managed through the role policy editor',
         };
     }
+    const canContainFallbackModels = field === 'baseagents'
+        || /^baseagents\.[^.]+$/.test(field)
+        || /^baseagents\.[^.]+\.fallbackModels(?:\.|$)/.test(field);
+    if (subcommand !== 'get' && canContainFallbackModels) {
+        return {
+            ok: false,
+            code: 'DEFAULTS_FILE_ONLY',
+            reason: 'fallbackModels is configured only by editing agents/defaults.json',
+        };
+    }
     const fieldRule = resolveConfigFieldRule(field);
     if (subcommand !== 'get' && fieldRule.class === 'safe-readonly-object') {
         return {

package/dist/core/auth/operation-catalog.js

@@ -397,7 +397,7 @@ const OPERATIONS = [
         category: 'write-agent',
         dangerous: false,
         defaultScopes: ['agent'],
-        description: 'Manage contacts, contact requests, and allowed group channels',
+        description: 'Manage contacts and contact requests',
         sources: ['menu', 'ecweb', 'control'],
     },
     {

package/dist/core/command/command-handler.js

@@ -803,10 +803,10 @@ export class CommandHandler {
         };
         if (s.agentSessionId) {
             item.agentSessionId = s.agentSessionId;
-            const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent);
+            const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
             if (fileInfo.turns)
                 item.turns = fileInfo.turns;
-            const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent);
+            const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
             if (firstMsg)
                 item.preview = firstMsg.length > 80 ? firstMsg.slice(0, 80) + '...' : firstMsg;
         }

package/dist/core/command/connect-menu.js

@@ -1,6 +1,6 @@
-import { roleMenuQuery, roleMenuUpdate, } from './role-menu.js';
+import { roleMenuQuery, roleMenuGroupCount, roleMenuUpdate, } from './role-menu.js';
 import { getContactSnapshot, resolveContactView } from '../../config/contact-book.js';
-import { listConfiguredChannelKeys, mutateAccessPolicy, readAccessPolicySnapshot, } from '../../config/access-policy.js';
+import { mutateAccessPolicy, readAccessPolicySnapshot, } from '../../config/access-policy.js';
 import { expirePendingContactRequests, mutateContactWithOperation, reviewContactRequest, } from '../../config/contact-request-service.js';
 import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
 /**
@@ -13,8 +13,8 @@ import { formatPeerKey, parsePeerKey } from '../relation/peer-identity.js';
  *   群组不落 contact.json（contact book 只接受个人 AID，group 会被拒绝）。
  * - 联系人与申请（view=contacts / contact，add / block / unblock / review）→ 直接读写
  *   Contact Book v3；contact.json 是当前状态和 pending 版本的唯一事实来源。
- * - 访问设置（view=access / option=allowedGroupChannels / resource=<access field>）→
- *   查询策略、列举群聊渠道候选项并逐字段写入 Agent config.json 的 access 字段。
+ * - 访问设置（view=access / resource=<access field>）→
+ *   查询和写入 Agent config.json 的 access 字段。
  */
 const MENU_NAME = 'connect';
 const DEFAULT_PAGE_SIZE = 50;
@@ -31,8 +31,6 @@ export function connectMenuOperation(kind, args, value) {
     if (kind === 'action')
         return 'connect.write';
     const resource = String(args?.resource ?? '');
-    if (resource === 'allowedGroupChannels')
-        return 'connect.write';
     if (resource === 'policyMode' || resource === 'requestLimit') {
         return 'connect.access.write';
     }
@@ -55,7 +53,7 @@ export async function handleConnectMenu(req, context) {
     }
     try {
         if (req.subtype === 'options')
-            return await handleOptions(self, req.args);
+            return await handleOptions(self, req.args, context);
         if (req.subtype === 'query')
             return await handleQuery(req, self, context);
         if (req.subtype === 'update')
@@ -69,26 +67,24 @@ export async function handleConnectMenu(req, context) {
     return fail('INVALID_ARGUMENT', `Unknown subtype: ${req.subtype}`);
 }
 // ── Options ──
-async function handleOptions(self, args) {
+async function handleOptions(self, args, context) {
     const option = String(args?.option ?? '').trim();
     if (option) {
-        if (option !== 'allowedGroupChannels') {
-            return fail('NOT_SUPPORTED', `Unknown connect option: ${option}`);
-        }
-        const selected = new Set(readAccessPolicySnapshot(self).policy.allowedGroupChannels);
-        return ok({
-            options: listConfiguredChannelKeys(self).map(channelKey => ({
-                option: channelKey,
-                label: channelKey,
-                selected: selected.has(channelKey),
-            })),
-        });
+        return fail('NOT_SUPPORTED', `Unknown connect option: ${option}`);
     }
     await expirePendingContactRequests(self);
     const snapshot = getContactSnapshot(self);
     const contactCount = snapshot.contacts.size;
     const blockedCount = snapshot.blockedIndex.size;
     const pendingCount = [...snapshot.contacts.values()].filter(entry => entry.status === 'pending').length;
+    let groupsDescription = '查看所在群组（数量暂不可用）';
+    try {
+        const groupCount = await roleMenuGroupCount(context);
+        groupsDescription = `查看所在群组（${groupCount} 个）`;
+    }
+    catch {
+        // Keep the root menu available when AUN group directory is disabled or unavailable.
+    }
     return ok({
         options: [
             {
@@ -99,12 +95,12 @@ async function handleOptions(self, args) {
             {
                 option: 'groups',
                 label: '群组列表',
-                description: '查看所在群组',
+                description: groupsDescription,
             },
             {
                 option: 'access',
                 label: '访问设置',
-                description: '设置私聊准入模式与允许群聊的渠道',
+                description: '设置消息准入模式和准入控制消息限额',
             },
         ],
     });
@@ -268,15 +264,11 @@ async function handleAction(req, self, context) {
 }
 function isAccessUpdateResource(resource) {
     return resource === 'policyMode'
-        || resource === 'allowedGroupChannels'
         || resource === 'requestLimit';
 }
 function updateAccessResource(req, context, resource) {
     const args = req.args ?? {};
-    if (resource === 'allowedGroupChannels')
-        requireAdminContext(context);
-    else
-        requireOwnerContext(context);
+    requireOwnerContext(context);
     if (req.value === undefined || !req.value.trim()) {
         return fail('INVALID_ARGUMENT', 'value is required');
     }
@@ -284,15 +276,8 @@ function updateAccessResource(req, context, resource) {
     const expectedAccessRevision = requireAccessRevision(args);
     const decoded = decodeAccessUpdateValue(req.value);
     if (resource === 'policyMode') {
-        if (typeof decoded !== 'string' || !['open', 'contacts', 'owners-only'].includes(decoded)) {
-            return fail('INVALID_ARGUMENT', 'policyMode must be open, contacts, or owners-only');
-        }
-    }
-    else if (resource === 'allowedGroupChannels') {
-        if (!Array.isArray(decoded)
-            || !decoded.every(value => typeof value === 'string' && value.length > 0)
-            || new Set(decoded).size !== decoded.length) {
-            return fail('INVALID_ARGUMENT', 'allowedGroupChannels must be a JSON string array');
+        if (typeof decoded !== 'string' || !['open', 'contacts', 'owners'].includes(decoded)) {
+            return fail('INVALID_ARGUMENT', 'policyMode must be open, contacts, or owners');
         }
     }
     else {
@@ -452,16 +437,12 @@ function errorCode(error) {
         return 'INTERNAL_ERROR';
     if (code === 'access_policy_owner_required')
         return 'PERMISSION_DENIED';
-    if (code === 'access_policy_manager_required')
-        return 'PERMISSION_DENIED';
     if (code === 'access_policy_revision_conflict')
         return 'CONFLICT';
     if (code === 'access_policy_temporarily_unavailable')
         return 'TEMPORARILY_UNAVAILABLE';
     if (code === 'restricted_mode_without_owner')
         return 'NOT_ALLOWED';
-    if (code === 'unknown_group_access_channel')
-        return 'INVALID_ARGUMENT';
     if (code === 'invalid_access_policy')
         return 'INTERNAL_ERROR';
     return typeof code === 'string' ? code : 'INTERNAL_ERROR';
@@ -538,9 +519,6 @@ function accessPolicyWithUpdate(current, resource, decoded) {
     if (resource === 'policyMode') {
         return { ...current, policyMode: decoded };
     }
-    if (resource === 'allowedGroupChannels') {
-        return { ...current, allowedGroupChannels: [...decoded] };
-    }
     const requestLimit = decoded;
     return {
         ...current,

package/dist/core/command/menu-handler.js

@@ -4,7 +4,7 @@ import { modelMatches } from '../model/model-catalog.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
 import { hasModelSwitcher } from '../../agents/runner-types.js';
 import { getCodexEfforts } from '../../agents/codex-runner.js';
-import { resolvePaths, getPackageRoot } from '../../paths.js';
+import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
 import { buildEnvelope } from '../message/message-utils.js';
 import path from 'path';
 import fs from 'fs';
@@ -1038,6 +1038,8 @@ function buildRoleMenuContext(owner, channel, subject) {
     return {
         self,
         actorRole: subject.role,
+        actorRoleSource: subject.roleSource,
+        actorAllowAccess: subject.allowAccess,
         actorAid: subject.actorId,
         chatType: subject.chatType,
         aunAvailable,
@@ -1537,10 +1539,10 @@ export async function getSubMenuItems(cmd, channel, channelId, userId, args, ove
             };
             if (s.agentSessionId) {
                 item.agentSessionId = s.agentSessionId;
-                const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent);
+                const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
                 if (fileInfo.turns)
                     item.turns = fileInfo.turns;
-                const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent);
+                const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID);
                 if (firstMsg)
                     item.preview = firstMsg.length > 80 ? firstMsg.slice(0, 80) + '…' : firstMsg;
             }
@@ -1903,7 +1905,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         }
         let turns = 0;
         if (session.agentSessionId) {
-            const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId, session.baseagent);
+            const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId, session.baseagent, session.selfAID);
             turns = fileInfo.turns;
         }
         const data = {
@@ -1950,7 +1952,7 @@ export async function execMenuQuery(cmd, channel, channelId, userId, args, expli
         }
         let turns = 0;
         if (topic.agentSessionId) {
-            turns = this.sessionManager.getSessionFileInfo(topic.projectPath, topic.agentSessionId, topic.baseagent).turns;
+            turns = this.sessionManager.getSessionFileInfo(topic.projectPath, topic.agentSessionId, topic.baseagent, topic.selfAID).turns;
         }
         const data = {
             threadId: topic.threadId,
@@ -2878,7 +2880,7 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
                 return { error: `无效 targetSession: ${targetSession}`, code: 'INVALID_ARGS' };
             }
             const triggerThread = args.triggerThread;
-            if (triggerThread !== undefined && triggerThread !== 'per_run' && triggerThread !== 'by_trigger') {
+            if (triggerThread !== undefined && triggerThread !== 'per_run' && triggerThread !== 'by_run' && triggerThread !== 'by_trigger') {
                 return { error: `无效 triggerThread: ${triggerThread}`, code: 'INVALID_ARGS' };
             }
             const parsed = {
@@ -3269,9 +3271,9 @@ export async function execMenuAction(cmd, action, args, channel, channelId, user
             const suppressRealRestart = shouldSuppressRealRestart();
             if (!suppressRealRestart) {
                 const restartInfo = { channel, channelId, timestamp: Date.now() };
-                const dataDir = resolvePaths().dataDir;
-                fs.mkdirSync(dataDir, { recursive: true });
-                fs.writeFileSync(path.join(dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
+                const controlDir = daemonControlDir();
+                fs.mkdirSync(controlDir, { recursive: true });
+                fs.writeFileSync(path.join(controlDir, 'restart-pending.json'), JSON.stringify(restartInfo));
                 const { spawn } = await import('child_process');
                 spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
                     detached: true,

package/dist/core/command/role-menu.js

@@ -156,6 +156,22 @@ export async function roleMenuQuery(context, args) {
         view: view || null,
     });
 }
+/**
+ * Read the current joined-group count without materializing the full group list.
+ * Used by Connect's root options description; failures are handled by the caller
+ * so a transient AUN directory outage does not hide the rest of the menu.
+ */
+export async function roleMenuGroupCount(context) {
+    assertRequest(context, { self: context.self });
+    assertAunDirectory(context);
+    const result = await roleDirectory(context).listGroups({ from: context.self, size: 1 });
+    if (!result.ok) {
+        throw roleError('TEMPORARILY_UNAVAILABLE', result.error || 'Unable to list joined groups', context.self, {
+            kind: 'target_source_unavailable', targetType: 'group',
+        });
+    }
+    return Math.max(Number(result.total) || 0, result.items.length);
+}
 export async function roleMenuUpdate(context, args, rawValue) {
     assertRequest(context, args);
     const value = parseUpdateValue(rawValue, context.self);
@@ -769,6 +785,7 @@ async function targetSnapshot(context, args, policyRevision) {
         target,
         relationRevision: relation?.revision ?? null,
         ...targetRoleView(self, target, relation?.config ?? null),
+        ...(target.kind === 'group' ? { requesterRole: requesterRoleResult(context) } : {}),
         relationConfig: relationConfigView(context, target, relation?.config ?? null),
     };
 }
@@ -1141,6 +1158,16 @@ function relationConfigView(context, target, config) {
 function roleResult(roleId, source, self) {
     return { roleId, source: roleId ? source : 'none', allowAccess: roleId ? checkRoleAccess(roleId, self) : false };
 }
+function requesterRoleResult(context) {
+    const roleId = isManagementRole(context.actorRole) ? context.actorRole : null;
+    return {
+        roleId,
+        source: roleId ? context.actorRoleSource ?? 'authenticated' : 'none',
+        allowAccess: roleId
+            ? context.actorAllowAccess ?? checkRoleAccess(roleId, context.self)
+            : false,
+    };
+}
 function readAgent(self) {
     const agent = read(ConfigTarget.Agent, { self }, { cache: false });
     if (!agent)

package/dist/core/command/slash-handler.js

@@ -1,7 +1,7 @@
 import { hasModelSwitcher, hasPermissionController } from '../../agents/runner-types.js';
 import { getCodexEfforts } from '../../agents/codex-runner.js';
 import { buildEnvelope } from '../message/message-utils.js';
-import { resolvePaths, getPackageRoot } from '../../paths.js';
+import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
 import { logger } from '../../utils/logger.js';
 import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
 import crypto from 'crypto';
@@ -2104,7 +2104,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         // 获取会话文件信息并同步 name
         let sessionTurns = 0;
         if (session.agentSessionId) {
-            const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId, session.baseagent);
+            const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId, session.baseagent, session.selfAID);
             sessionTurns = fileInfo.turns;
             if (fileInfo.title && fileInfo.title !== session.name) {
                 await this.sessionManager.renameSession(session.id, fileInfo.title);
@@ -2482,9 +2482,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 ...(replyContext?.replyToMessageId ? { rootId: replyContext.replyToMessageId } : {}),
             };
             if (!suppressRealRestart) {
-                const dataDir = resolvePaths().dataDir;
-                fs.mkdirSync(dataDir, { recursive: true });
-                fs.writeFileSync(path.join(dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
+                const controlDir = daemonControlDir();
+                fs.mkdirSync(controlDir, { recursive: true });
+                fs.writeFileSync(path.join(controlDir, 'restart-pending.json'), JSON.stringify(restartInfo));
                 const { spawn } = await import('child_process');
                 spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
                     detached: true,
@@ -2531,9 +2531,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         // 文本确认流程
         if (sessionsWithMessages.length > 0) {
             const restartKey = `${channel}-${channelId}`;
-            const dataDir = resolvePaths().dataDir;
-            fs.mkdirSync(dataDir, { recursive: true });
-            const restartConfirmFile = path.join(dataDir, `restart-confirm-${restartKey}.json`);
+            const controlDir = daemonControlDir();
+            fs.mkdirSync(controlDir, { recursive: true });
+            const restartConfirmFile = path.join(controlDir, `restart-confirm-${restartKey}.json`);
             if (fs.existsSync(restartConfirmFile)) {
                 const confirmInfo = JSON.parse(fs.readFileSync(restartConfirmFile, 'utf-8'));
                 const now = Date.now();
@@ -2740,7 +2740,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             if (!canImportCli) {
                 return { kind: 'command.error', text: '❌ 当前无权查看 CLI 会话' };
             }
-            const orphanCliSessions = await this.sessionManager.listImportableCliSessions(session.projectPath, session.baseagent);
+            const orphanCliSessions = session.baseagent === 'ecagent'
+                ? await this.sessionManager.listImportableCliSessions(session.projectPath, session.baseagent, session.selfAID)
+                : await this.sessionManager.listImportableCliSessions(session.projectPath, session.baseagent);
             if (orphanCliSessions.length === 0) {
                 return { kind: 'command.result', text: `当前项目 ${path.basename(session.projectPath)} 没有未导入的 CLI 会话` };
             }
@@ -2790,7 +2792,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const currentProjectSessions = sessions.filter((s) => s.projectPath === session.projectPath && s.baseagent === session.baseagent && !s.threadId);
         // 从 SDK 同步会话名称（发现 CLI 改名）
         try {
-            const sdkSessions = await this.sessionManager.listSdkSessions(session.projectPath, session.baseagent);
+            const sdkSessions = await this.sessionManager.listSdkSessions(session.projectPath, session.baseagent, session.selfAID);
             for (const sdkSession of sdkSessions) {
                 if (!sdkSession.title)
                     continue;
@@ -2816,7 +2818,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             displayIndex++;
             const name = displaySessionTitle(s.name, '(未命名)');
             const idleTime = formatIdleTime(Date.now() - s.updatedAt);
-            const fileMissing = !!(s.agentSessionId && !this.sessionManager.checkSessionFileExists(s.projectPath, s.agentSessionId, s.baseagent));
+            const fileMissing = !!(s.agentSessionId && !this.sessionManager.checkSessionFileExists(s.projectPath, s.agentSessionId, s.baseagent, s.selfAID));
             let status = '[空闲]';
             if (fileMissing) {
                 status = '[会话文件缺失]';
@@ -2933,10 +2935,12 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             }
             for (const projectPath of projectPaths) {
                 const currentBaseagent = session?.baseagent || this.primaryRunnerKey;
-                const cliSessions = await this.sessionManager.listImportableCliSessions(projectPath, currentBaseagent);
+                const cliSessions = currentBaseagent === 'ecagent'
+                    ? await this.sessionManager.listImportableCliSessions(projectPath, currentBaseagent, selfAID ?? session?.selfAID)
+                    : await this.sessionManager.listImportableCliSessions(projectPath, currentBaseagent);
                 const cliSession = cliSessions.find((c) => c.uuid.startsWith(sessionName));
                 if (cliSession) {
-                    const imported = await this.sessionManager.importCliSession(channel, channelId, projectPath, cliSession.uuid, currentBaseagent);
+                    const imported = await this.sessionManager.importCliSession(channel, channelId, projectPath, cliSession.uuid, currentBaseagent, selfAID ?? session?.selfAID);
                     this.eventBus.publish({ type: 'session:imported', sessionId: imported.id, agentSessionId: cliSession.uuid, projectPath });
                     const projectName = this.getProjectName(projectPath);
                     return { kind: 'command.result', text: `✓ 已导入 CLI 会话: ${displaySessionTitle(imported.name, '(未命名)')}\n  项目: ${projectName}\n  将继续之前的对话历史` };
@@ -2947,7 +2951,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             return { kind: 'command.error', text: `❌ 会话不存在: ${sessionName}\n使用 /s 查看可用会话` };
         }
         const lastInput = targetSession.agentSessionId
-            ? this.sessionManager.readSessionLastUserMessage(targetSession.projectPath, targetSession.agentSessionId, targetSession.baseagent)
+            ? this.sessionManager.readSessionLastUserMessage(targetSession.projectPath, targetSession.agentSessionId, targetSession.baseagent, targetSession.selfAID)
             : null;
         const lastInputLine = lastInput ? `\n  最后输入: "${lastInput}"` : '';
         if (!session) {