@wu529778790/open-im 1.10.9-beta.7 → 1.10.9-beta.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -9,6 +9,11 @@
|
|
|
9
9
|
* 认证：ANTHROPIC_API_KEY 或 CLAUDE_CODE_OAUTH_TOKEN
|
|
10
10
|
*/
|
|
11
11
|
import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';
|
|
12
|
+
/**
|
|
13
|
+
* 标记某个 workDir 下的用户显式执行了 /new，下次创建会话时跳过 auto-resume。
|
|
14
|
+
* 由命令处理器在 /new 时调用。
|
|
15
|
+
*/
|
|
16
|
+
export declare function markSkipAutoResume(workDir: string): void;
|
|
12
17
|
interface ClaudeSessionMeta {
|
|
13
18
|
sessionId: string;
|
|
14
19
|
mtime: number;
|
|
@@ -97,6 +97,14 @@ function isCliSessionActive(sessionId, sessionFilePath) {
|
|
|
97
97
|
return false;
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* 标记某个 workDir 下的用户显式执行了 /new，下次创建会话时跳过 auto-resume。
|
|
102
|
+
* 由命令处理器在 /new 时调用。
|
|
103
|
+
*/
|
|
104
|
+
export function markSkipAutoResume(workDir) {
|
|
105
|
+
skipAutoResumeFor.add(workDir);
|
|
106
|
+
log.info(`Marked skip auto-resume for workDir: ${workDir}`);
|
|
107
|
+
}
|
|
100
108
|
/**
|
|
101
109
|
* 扫描 ~/.claude/projects/<encoded-path>/ 找到最新的 CLI session。
|
|
102
110
|
* 只返回 JSONL 文件（排除子目录如 subagents/），按修改时间倒序。
|
|
@@ -179,6 +187,9 @@ function validateSessionFile(filePath, expectedSessionId) {
|
|
|
179
187
|
// 存储所有活跃的 SDKSession 对象，key 为 sessionId
|
|
180
188
|
// 使用 Map 而不是 Set，因为我们需要通过 sessionId 获取 session
|
|
181
189
|
const activeSessions = new Map();
|
|
190
|
+
// 用户显式执行 /new 后标记跳过 auto-resume，避免立即接回旧 CLI session
|
|
191
|
+
// key 格式: `${workDir}\0${sessionIdPrefix}`（用 workDir 区分不同项目目录）
|
|
192
|
+
const skipAutoResumeFor = new Set();
|
|
182
193
|
// 记录每个 session 创建/恢复时的 workDir，防止跨 workDir 复用已固定 cwd 的子进程
|
|
183
194
|
const sessionWorkDirs = new Map();
|
|
184
195
|
// 存储正在进行的流式迭代器，用于中断
|
|
@@ -379,30 +390,37 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode, onS
|
|
|
379
390
|
// 没有指定 sessionId 时，尝试自动恢复 Claude Code CLI 的最新 session
|
|
380
391
|
// 实现手机/电脑无缝切换：同目录下默认共享同一个对话
|
|
381
392
|
if (!sessionId) {
|
|
382
|
-
|
|
383
|
-
if (
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
session = unstable_v2_resumeSession(latest.sessionId, sessionOptions);
|
|
394
|
-
activeSessions.set(latest.sessionId, session);
|
|
395
|
-
sessionWorkDirs.set(latest.sessionId, workDir);
|
|
396
|
-
sessionLastUsed.set(latest.sessionId, Date.now());
|
|
397
|
-
log.info(`Successfully auto-resumed CLI session: ${latest.sessionId}`);
|
|
398
|
-
return { session, sessionId: latest.sessionId };
|
|
399
|
-
}
|
|
400
|
-
catch (err) {
|
|
401
|
-
log.warn(`Failed to auto-resume CLI session ${latest.sessionId}, skipping auto-resume: ${err}`);
|
|
402
|
-
}
|
|
393
|
+
// 用户显式 /new 后跳过 auto-resume，创建真正的新会话
|
|
394
|
+
if (skipAutoResumeFor.has(workDir)) {
|
|
395
|
+
skipAutoResumeFor.delete(workDir);
|
|
396
|
+
log.info(`Skipping auto-resume for workDir ${workDir} (user explicit /new)`);
|
|
397
|
+
}
|
|
398
|
+
else {
|
|
399
|
+
const latest = findLatestClaudeSession(workDir);
|
|
400
|
+
if (latest) {
|
|
401
|
+
// 安全检查：如果 CLI 正在使用该 session，不能接管
|
|
402
|
+
if (isCliSessionActive(latest.sessionId, latest.filePath)) {
|
|
403
|
+
log.info(`CLI is actively using session ${latest.sessionId}, skipping auto-resume`);
|
|
403
404
|
}
|
|
404
405
|
else {
|
|
405
|
-
|
|
406
|
+
// 验证文件内容一致性
|
|
407
|
+
if (validateSessionFile(latest.filePath, latest.sessionId)) {
|
|
408
|
+
try {
|
|
409
|
+
log.info(`Auto-resuming latest CLI session: ${latest.sessionId}`);
|
|
410
|
+
session = unstable_v2_resumeSession(latest.sessionId, sessionOptions);
|
|
411
|
+
activeSessions.set(latest.sessionId, session);
|
|
412
|
+
sessionWorkDirs.set(latest.sessionId, workDir);
|
|
413
|
+
sessionLastUsed.set(latest.sessionId, Date.now());
|
|
414
|
+
log.info(`Successfully auto-resumed CLI session: ${latest.sessionId}`);
|
|
415
|
+
return { session, sessionId: latest.sessionId };
|
|
416
|
+
}
|
|
417
|
+
catch (err) {
|
|
418
|
+
log.warn(`Failed to auto-resume CLI session ${latest.sessionId}, skipping auto-resume: ${err}`);
|
|
419
|
+
}
|
|
420
|
+
}
|
|
421
|
+
else {
|
|
422
|
+
log.warn(`Session file validation failed for ${latest.sessionId}, skipping`);
|
|
423
|
+
}
|
|
406
424
|
}
|
|
407
425
|
}
|
|
408
426
|
}
|
package/dist/commands/handler.js
CHANGED
|
@@ -2,6 +2,7 @@ import { resolvePlatformAiCommand } from '../config.js';
|
|
|
2
2
|
import { escapePathForMarkdown } from '../shared/utils.js';
|
|
3
3
|
import { TERMINAL_ONLY_COMMANDS } from '../constants.js';
|
|
4
4
|
import { createLogger } from '../logger.js';
|
|
5
|
+
import { markSkipAutoResume } from '../adapters/claude-sdk-adapter.js';
|
|
5
6
|
const log = createLogger('Commands');
|
|
6
7
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
7
8
|
import { execFile } from 'node:child_process';
|
|
@@ -135,6 +136,8 @@ export class CommandHandler {
|
|
|
135
136
|
}
|
|
136
137
|
async handleNew(chatId, userId) {
|
|
137
138
|
this.deps.requestQueue.cancelUser(userId);
|
|
139
|
+
const workDir = this.deps.sessionManager.getWorkDir(userId);
|
|
140
|
+
markSkipAutoResume(workDir);
|
|
138
141
|
const ok = this.deps.sessionManager.newSession(userId);
|
|
139
142
|
await this.replySender().sendTextReply(chatId, ok
|
|
140
143
|
? '✅ AI 会话已重置，下一条消息将使用全新上下文。'
|