@wu529778790/open-im 1.10.9-beta.8 → 1.10.9-beta.9

package/dist/adapters/claude-sdk-adapter.d.ts

@@ -9,11 +9,6 @@
  * 认证：ANTHROPIC_API_KEY 或 CLAUDE_CODE_OAUTH_TOKEN
  */
 import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';
-/**
- * 标记某个 workDir 下的用户显式执行了 /new，下次创建会话时跳过 auto-resume。
- * 由命令处理器在 /new 时调用。
- */
-export declare function markSkipAutoResume(workDir: string): void;
 interface ClaudeSessionMeta {
     sessionId: string;
     mtime: number;

package/dist/adapters/claude-sdk-adapter.js

@@ -97,14 +97,6 @@ function isCliSessionActive(sessionId, sessionFilePath) {
         return false;
     }
 }
-/**
- * 标记某个 workDir 下的用户显式执行了 /new，下次创建会话时跳过 auto-resume。
- * 由命令处理器在 /new 时调用。
- */
-export function markSkipAutoResume(workDir) {
-    skipAutoResumeFor.add(workDir);
-    log.info(`Marked skip auto-resume for workDir: ${workDir}`);
-}
 /**
  * 扫描 ~/.claude/projects/<encoded-path>/ 找到最新的 CLI session。
  * 只返回 JSONL 文件（排除子目录如 subagents/），按修改时间倒序。
@@ -187,9 +179,6 @@ function validateSessionFile(filePath, expectedSessionId) {
 // 存储所有活跃的 SDKSession 对象，key 为 sessionId
 // 使用 Map 而不是 Set，因为我们需要通过 sessionId 获取 session
 const activeSessions = new Map();
-// 用户显式执行 /new 后标记跳过 auto-resume，避免立即接回旧 CLI session
-// key 格式: `${workDir}\0${sessionIdPrefix}`（用 workDir 区分不同项目目录）
-const skipAutoResumeFor = new Set();
 // 记录每个 session 创建/恢复时的 workDir，防止跨 workDir 复用已固定 cwd 的子进程
 const sessionWorkDirs = new Map();
 // 存储正在进行的流式迭代器，用于中断
@@ -390,38 +379,31 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode, onS
             // 没有指定 sessionId 时，尝试自动恢复 Claude Code CLI 的最新 session
             // 实现手机/电脑无缝切换：同目录下默认共享同一个对话
             if (!sessionId) {
-                // 用户显式 /new 后跳过 auto-resume，创建真正的新会话
-                if (skipAutoResumeFor.has(workDir)) {
-                    skipAutoResumeFor.delete(workDir);
-                    log.info(`Skipping auto-resume for workDir ${workDir} (user explicit /new)`);
-                }
-                else {
-                    const latest = findLatestClaudeSession(workDir);
-                    if (latest) {
-                        // 安全检查：如果 CLI 正在使用该 session，不能接管
-                        if (isCliSessionActive(latest.sessionId, latest.filePath)) {
-                            log.info(`CLI is actively using session ${latest.sessionId}, skipping auto-resume`);
-                        }
-                        else {
-                            // 验证文件内容一致性
-                            if (validateSessionFile(latest.filePath, latest.sessionId)) {
-                                try {
-                                    log.info(`Auto-resuming latest CLI session: ${latest.sessionId}`);
-                                    session = unstable_v2_resumeSession(latest.sessionId, sessionOptions);
-                                    activeSessions.set(latest.sessionId, session);
-                                    sessionWorkDirs.set(latest.sessionId, workDir);
-                                    sessionLastUsed.set(latest.sessionId, Date.now());
-                                    log.info(`Successfully auto-resumed CLI session: ${latest.sessionId}`);
-                                    return { session, sessionId: latest.sessionId };
-                                }
-                                catch (err) {
-                                    log.warn(`Failed to auto-resume CLI session ${latest.sessionId}, skipping auto-resume: ${err}`);
-                                }
+                const latest = findLatestClaudeSession(workDir);
+                if (latest) {
+                    // 安全检查：如果 CLI 正在使用该 session（文件 30 秒内有写入），不能接管
+                    if (isCliSessionActive(latest.sessionId, latest.filePath)) {
+                        log.info(`CLI is actively using session ${latest.sessionId}, skipping auto-resume`);
+                    }
+                    else {
+                        // 验证文件内容一致性
+                        if (validateSessionFile(latest.filePath, latest.sessionId)) {
+                            try {
+                                log.info(`Auto-resuming latest CLI session: ${latest.sessionId}`);
+                                session = unstable_v2_resumeSession(latest.sessionId, sessionOptions);
+                                activeSessions.set(latest.sessionId, session);
+                                sessionWorkDirs.set(latest.sessionId, workDir);
+                                sessionLastUsed.set(latest.sessionId, Date.now());
+                                log.info(`Successfully auto-resumed CLI session: ${latest.sessionId}`);
+                                return { session, sessionId: latest.sessionId };
                             }
-                            else {
-                                log.warn(`Session file validation failed for ${latest.sessionId}, skipping`);
+                            catch (err) {
+                                log.warn(`Failed to auto-resume CLI session ${latest.sessionId}, skipping auto-resume: ${err}`);
                             }
                         }
+                        else {
+                            log.warn(`Session file validation failed for ${latest.sessionId}, skipping`);
+                        }
                     }
                 }
             }

package/dist/commands/handler.js

@@ -2,7 +2,6 @@ import { resolvePlatformAiCommand } from '../config.js';
 import { escapePathForMarkdown } from '../shared/utils.js';
 import { TERMINAL_ONLY_COMMANDS } from '../constants.js';
 import { createLogger } from '../logger.js';
-import { markSkipAutoResume } from '../adapters/claude-sdk-adapter.js';
 const log = createLogger('Commands');
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { execFile } from 'node:child_process';
@@ -136,8 +135,6 @@ export class CommandHandler {
     }
     async handleNew(chatId, userId) {
         this.deps.requestQueue.cancelUser(userId);
-        const workDir = this.deps.sessionManager.getWorkDir(userId);
-        markSkipAutoResume(workDir);
         const ok = this.deps.sessionManager.newSession(userId);
         await this.replySender().sendTextReply(chatId, ok
             ? '✅ AI 会话已重置，下一条消息将使用全新上下文。'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.10.9-beta.8",
+  "version": "1.10.9-beta.9",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",