evolcore 0.0.5 → 0.0.6

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) {