sessix-server 0.5.0 → 0.5.3

package/dist/index.js

@@ -308,6 +308,8 @@ var import_node_os9 = require("os");
 var import_node_path9 = require("path");
 var import_node_child_process12 = require("child_process");
 var import_node_util3 = require("util");
+var import_node_v8 = require("v8");
+var import_node_vm = require("vm");
 
 // src/providers/ProcessProvider.ts
 var import_child_process = require("child_process");
@@ -450,26 +452,33 @@ function getSessionFilePath(projectPath, sessionId) {
 }
 async function getSessionModel(projectPath, sessionId) {
   const filePath = getSessionFilePath(projectPath, sessionId);
-  const raw = await (0, import_promises.readFile)(filePath, "utf-8").catch((err) => {
-    if (err.code === "ENOENT") return null;
-    throw err;
-  });
-  if (raw === null) return void 0;
-  const lines = raw.split("\n");
-  for (let i = lines.length - 1; i >= 0; i--) {
-    const line = lines[i].trim();
-    if (!line) continue;
-    try {
-      const obj = JSON.parse(line);
-      if (obj.type !== "assistant" || !obj.message) continue;
-      const model = obj.message.model;
-      if (typeof model === "string" && model && model !== "unknown") {
-        return model;
+  let fileHandle;
+  try {
+    fileHandle = await (0, import_promises.open)(filePath, "r");
+    const rl = (0, import_readline.createInterface)({
+      input: fileHandle.createReadStream({ encoding: "utf-8" }),
+      crlfDelay: Infinity
+    });
+    let lastModel;
+    for await (const line of rl) {
+      if (!line.trim()) continue;
+      try {
+        const obj = JSON.parse(line);
+        if (obj.type !== "assistant" || !obj.message) continue;
+        const model = obj.message.model;
+        if (typeof model === "string" && model && model !== "unknown") {
+          lastModel = model;
+        }
+      } catch {
       }
-    } catch {
     }
+    return lastModel;
+  } catch (err) {
+    if (err.code === "ENOENT") return void 0;
+    throw err;
+  } finally {
+    await fileHandle?.close();
   }
-  return void 0;
 }
 async function getProjects() {
   try {
@@ -598,17 +607,23 @@ async function getHistoricalSessions(projectPath) {
   }
 }
 async function getSessionHistory(projectPath, sessionId) {
+  let fileHandle;
   try {
     const encodedPath = encodeDirName(projectPath);
     const filePath = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath, `${sessionId}.jsonl`);
-    const raw = await (0, import_promises.readFile)(filePath, "utf-8").catch((err) => {
-      if (err.code === "ENOENT") return null;
+    try {
+      fileHandle = await (0, import_promises.open)(filePath, "r");
+    } catch (err) {
+      if (err.code === "ENOENT") return { ok: true, value: [] };
       throw err;
+    }
+    const rl = (0, import_readline.createInterface)({
+      input: fileHandle.createReadStream({ encoding: "utf-8" }),
+      crlfDelay: Infinity
     });
-    if (raw === null) return { ok: true, value: [] };
-    const lines = raw.split("\n").filter((l) => l.trim());
     const events = [];
-    for (const line of lines) {
+    for await (const line of rl) {
+      if (!line.trim()) continue;
       try {
         const obj = JSON.parse(line);
         const type = obj.type;
@@ -681,6 +696,8 @@ async function getSessionHistory(projectPath, sessionId) {
       ok: false,
       error: err instanceof Error ? err : new Error(String(err))
     };
+  } finally {
+    await fileHandle?.close();
   }
 }
 async function extractLastTimestamp(filePath) {
@@ -1025,6 +1042,27 @@ var ProcessProvider = class {
     }
     return swept;
   }
+  /**
+   * 枚举可淘汰的老会话
+   *
+   * 进程已退出（已被空闲 GC kill）且空闲超过 maxIdleMs 的会话——其 entry 与各 Map
+   * 仍长期占内存。调用方对返回 id 执行 killSession 彻底清除；淘汰后手机端发消息
+   * 会自动走 resume 路径（--resume + JSONL），不影响继续对话。
+   *
+   * @returns 可淘汰的 sessionId 列表（仅枚举，不删除）
+   */
+  listEvictableSessions(maxIdleMs) {
+    if (maxIdleMs <= 0) return [];
+    const now = Date.now();
+    const evictable = [];
+    for (const [sessionId, entry] of this.activeSessions) {
+      if (entry.process.exitCode === null && entry.process.signalCode === null) continue;
+      if (entry.session.status === "running" || entry.session.status === "waiting_question" || entry.session.status === "waiting_approval") continue;
+      if (now - entry.session.lastActiveAt < maxIdleMs) continue;
+      evictable.push(sessionId);
+    }
+    return evictable;
+  }
   // ============================================
   // 私有方法
   // ============================================
@@ -2041,10 +2079,18 @@ var SessionManager = class {
   sessionAgentType = /* @__PURE__ */ new Map();
   /** 事件回调列表（事件会被转发到 WsBridge） */
   eventCallbacks = [];
+  /** 会话被移除（kill / 淘汰）时的回调列表（用于释放外部模块的会话级状态，如 NotificationService） */
+  sessionRemovedCallbacks = [];
   /** 每个会话的事件流取消订阅函数 */
   unsubscribeMap = /* @__PURE__ */ new Map();
   /** 每个会话的事件缓冲区（用于新订阅者重放）*/
   sessionEventBuffers = /* @__PURE__ */ new Map();
+  /**
+   * 每个会话最近一次 AskUserQuestion tool_use 的真实 id（从 claude_event 流捕获）。
+   * PreToolUse hook payload 不含 tool_use_id，但内联卡片需要它来匹配状态，
+   * 故在转发流事件时记录，askQuestion 时兜底回填。
+   */
+  lastAskQuestionToolUseId = /* @__PURE__ */ new Map();
   /** AskUserQuestion 问题映射：requestId → resolve 回调 + 原始问题内容 */
   pendingQuestions = /* @__PURE__ */ new Map();
   /**
@@ -2153,6 +2199,7 @@ var SessionManager = class {
     this.bufferTruncated.delete(sessionId);
     this.sessionProjectPaths.delete(sessionId);
     this.sessionStats.delete(sessionId);
+    this.lastAskQuestionToolUseId.delete(sessionId);
     const pending = this.pendingAssistantEvents.get(sessionId);
     if (pending) {
       clearTimeout(pending.timer);
@@ -2161,6 +2208,13 @@ var SessionManager = class {
     const provider = this.getProviderForSession(sessionId);
     await provider.killSession(sessionId);
     this.sessionAgentType.delete(sessionId);
+    for (const cb of this.sessionRemovedCallbacks) {
+      try {
+        cb(sessionId);
+      } catch (err) {
+        console.error("[SessionManager] sessionRemoved callback failed:", err);
+      }
+    }
     console.log(`[SessionManager] Session killed: ${sessionId}`);
   }
   /**
@@ -2351,6 +2405,21 @@ var SessionManager = class {
       }
     };
   }
+  /**
+   * 注册"会话被移除"回调（会话 kill 或淘汰时触发，传入 sessionId）。
+   * 用于让外部模块释放会话级状态，如 NotificationService.releaseSession。
+   *
+   * @returns 取消注册的函数
+   */
+  onSessionRemoved(callback) {
+    this.sessionRemovedCallbacks.push(callback);
+    return () => {
+      const index = this.sessionRemovedCallbacks.indexOf(callback);
+      if (index !== -1) {
+        this.sessionRemovedCallbacks.splice(index, 1);
+      }
+    };
+  }
   /**
    * 清理所有资源
    */
@@ -2374,6 +2443,7 @@ var SessionManager = class {
     this.pendingQuestions.clear();
     this.lastBroadcastStatus.clear();
     this.eventCallbacks.length = 0;
+    this.sessionRemovedCallbacks.length = 0;
     console.log("[SessionManager] Destroyed");
   }
   // ============================================
@@ -2422,6 +2492,13 @@ var SessionManager = class {
         console.log(`[SessionManager] \u{1F9E0} thinking block detected in ${sessionId}: msgId=${event.message.id}, blocks=${thinkingBlocks.length}, len=${thinkingBlocks.map((b) => (b.thinking || "").length).join(",")}`);
       }
     }
+    if (event.type === "assistant" && Array.isArray(event.message?.content)) {
+      for (const block of event.message.content) {
+        if (block.type === "tool_use" && (block.name === "AskUserQuestion" || block.name === "AskFollowupQuestion") && typeof block.id === "string") {
+          this.lastAskQuestionToolUseId.set(sessionId, block.id);
+        }
+      }
+    }
     switch (event.type) {
       case "assistant":
         this.bufferAssistantEvent(sessionId, event);
@@ -2542,10 +2619,11 @@ var SessionManager = class {
    * 返回的 Promise 在 handleQuestionResponse 时 resolve。
    */
   askQuestion(sessionId, toolUseId, questions, requestId) {
+    const resolvedToolUseId = toolUseId || this.lastAskQuestionToolUseId.get(sessionId) || "";
     const request = {
       id: requestId,
       sessionId,
-      toolUseId,
+      toolUseId: resolvedToolUseId,
       question: questions[0]?.question ?? "",
       options: questions[0]?.options?.map((o) => o.label),
       questions,
@@ -2557,7 +2635,7 @@ var SessionManager = class {
     return new Promise((resolve) => {
       this.pendingQuestions.set(requestId, {
         sessionId,
-        toolUseId,
+        toolUseId: resolvedToolUseId,
         question: request.question,
         options: request.options,
         questions,
@@ -4079,7 +4157,8 @@ var HookInstaller = class {
     const isLatestVersion = approvalScriptContent.includes("permissionDecision") && approvalScriptContent.includes("Sessix Approval Hook v2");
     const settings = await this.readClaudeSettings();
     const configExists = this.hasHookConfig(settings);
-    return isLatestVersion && permissionScriptExists && compactScriptExists && postCompactScriptExists && permissionDeniedScriptExists && configExists;
+    const hasLegacyHook = this.hasHookEntry(settings?.hooks?.PreToolUse, LEGACY_HOOK_COMMANDS[0]) || this.hasHookEntry(settings?.hooks?.PermissionRequest, LEGACY_HOOK_COMMANDS[1]);
+    return isLatestVersion && permissionScriptExists && compactScriptExists && postCompactScriptExists && permissionDeniedScriptExists && configExists && !hasLegacyHook;
   }
   // ============================================
   // 内部方法
@@ -4091,8 +4170,14 @@ var HookInstaller = class {
     let settings = await this.readClaudeSettings();
     let changed = false;
     for (const cmd of LEGACY_HOOK_COMMANDS) {
-      this.removeHookCommand(settings, "PreToolUse", cmd);
-      this.removeHookCommand(settings, "PermissionRequest", cmd);
+      if (this.hasHookEntry(settings?.hooks?.PreToolUse, cmd)) {
+        this.removeHookCommand(settings, "PreToolUse", cmd);
+        changed = true;
+      }
+      if (this.hasHookEntry(settings?.hooks?.PermissionRequest, cmd)) {
+        this.removeHookCommand(settings, "PermissionRequest", cmd);
+        changed = true;
+      }
     }
     if (!settings.hooks) {
       settings.hooks = {};
@@ -4489,12 +4574,40 @@ var NotificationService = class _NotificationService {
     this.latestAssistantText.clear();
     for (const timer of this.activityPushTimers.values()) clearTimeout(timer);
     this.activityPushTimers.clear();
+    for (const timer of this.idleEndTimers.values()) clearTimeout(timer);
+    this.idleEndTimers.clear();
+    for (const timer of this.laHeartbeatTimers.values()) clearInterval(timer);
+    this.laHeartbeatTimers.clear();
     this.recentActivityState.clear();
     this.lastActivityPushAt.clear();
     this.pendingPriority.clear();
     this.activityCounters.clear();
     this.lastPushedFingerprint.clear();
   }
+  /**
+   * 释放单个会话的全部内存状态（会话被 kill 或淘汰时调用）。
+   * 由 SessionManager.onSessionRemoved 钩子触发，覆盖用户主动 kill 和自动淘汰两条路径。
+   * 幂等：重复调用或对未知会话调用都安全。
+   */
+  releaseSession(sessionId) {
+    this.clearActivityPushTimer(sessionId);
+    this.cancelIdleEndTimer(sessionId);
+    this.stopLaHeartbeat(sessionId);
+    this.clearSessionActivityState(sessionId);
+    this.yoloModeState.delete(sessionId);
+    this.lastActivityPushAt.delete(sessionId);
+    this.lastPushedFingerprint.delete(sessionId);
+    this.pendingPriority.delete(sessionId);
+  }
+  /**
+   * 清空单会话可重建的重状态（recentActivity / 计数器 / 最新文本）。
+   * 会话走到 idle 时调用即可释放内存——resume 后这些状态会随新事件自动重建。
+   */
+  clearSessionActivityState(sessionId) {
+    this.recentActivityState.delete(sessionId);
+    this.activityCounters.delete(sessionId);
+    this.latestAssistantText.delete(sessionId);
+  }
   // ============================================
   // 内部方法
   // ============================================
@@ -4532,6 +4645,7 @@ var NotificationService = class _NotificationService {
               badge: this.getGlobalPendingCount(),
               data: { type: "task_complete", sessionId: event.sessionId }
             });
+            this.clearSessionActivityState(event.sessionId);
           }
         } else if (event.status === "running" || event.status === "waiting_approval" || event.status === "waiting_question") {
           this.cancelIdleEndTimer(event.sessionId);
@@ -4820,9 +4934,8 @@ var NotificationService = class _NotificationService {
       });
     }
     this.stopLaHeartbeat(sessionId);
-    this.recentActivityState.delete(sessionId);
+    this.clearSessionActivityState(sessionId);
     this.lastActivityPushAt.delete(sessionId);
-    this.activityCounters.delete(sessionId);
     this.lastPushedFingerprint.delete(sessionId);
     console.log(`[NotificationService] \u{1F3C1} LA end (${reason}) session=${sessionId.slice(0, 8)}\u2026`);
   }
@@ -5923,7 +6036,6 @@ var SKIP_DIRS = /* @__PURE__ */ new Set([
   "DerivedData",
   "Pods",
   ".build",
-  "build",
   "dist",
   "__pycache__",
   ".next",
@@ -7091,10 +7203,11 @@ function isValidTask(value) {
 // src/utils/cliCapabilities.ts
 var import_node_child_process11 = require("child_process");
 var DEFAULT_MODELS = [
-  { value: "opus", label: "Opus 4.7", sublabel: "Most capable for ambitious work" },
-  { value: "claude-opus-4-6", label: "Opus 4.6", sublabel: "Previous generation flagship" },
-  { value: "sonnet", label: "Sonnet 4.6", sublabel: "Most efficient for everyday tasks" },
-  { value: "haiku", label: "Haiku 4.5", sublabel: "Fastest for quick answers" }
+  { value: "opus", label: "Opus 4.8", sublabel: "Most capable for ambitious work", maxEffort: "max", defaultEffort: "xhigh" },
+  { value: "claude-opus-4-7", label: "Opus 4.7", sublabel: "Previous generation flagship", maxEffort: "max", defaultEffort: "xhigh" },
+  { value: "claude-opus-4-6", label: "Opus 4.6", sublabel: "Earlier generation flagship", maxEffort: "max", defaultEffort: "xhigh" },
+  { value: "sonnet", label: "Sonnet 4.6", sublabel: "Most efficient for everyday tasks", maxEffort: "high", defaultEffort: "high" },
+  { value: "haiku", label: "Haiku 4.5", sublabel: "Fastest for quick answers", maxEffort: "medium", defaultEffort: "medium" }
 ];
 var DEFAULT_CAPABILITIES = {
   effortLevels: ["low", "medium", "high", "xhigh", "max"],
@@ -7262,6 +7375,7 @@ async function start(opts = {}) {
   const notificationService = new NotificationService(sessionManager, expoChannel);
   notificationService.addChannel("expo", expoChannel, opts.enableExpoPush !== false);
   notificationService.addChannel("mac", new DesktopNotificationChannel(), opts.enableMacNotification !== false);
+  sessionManager.onSessionRemoved((sessionId) => notificationService.releaseSession(sessionId));
   const activityPushOpts = opts.activityPush ?? await loadApnsConfigFromFile();
   if (activityPushOpts) {
     try {
@@ -7950,8 +8064,30 @@ async function start(opts = {}) {
   const idleTimeoutMs = Number(process.env.SESSIX_IDLE_TIMEOUT_MS ?? 30 * 60 * 1e3);
   const idleSweepIntervalMs = Number(process.env.SESSIX_IDLE_SWEEP_INTERVAL_MS ?? 5 * 60 * 1e3);
   const maxActiveProcesses = Number(process.env.SESSIX_MAX_ACTIVE_PROCESSES ?? 15);
+  const sessionEvictMs = Number(process.env.SESSIX_SESSION_EVICT_MS ?? 2 * 60 * 60 * 1e3);
+  let gcFn;
+  const maybeGc = () => {
+    if (gcFn === void 0) {
+      gcFn = globalThis.gc ?? null;
+      if (!gcFn) {
+        try {
+          (0, import_node_v8.setFlagsFromString)("--expose-gc");
+          const fn = (0, import_node_vm.runInNewContext)("gc");
+          gcFn = typeof fn === "function" ? fn : null;
+        } catch {
+          gcFn = null;
+        }
+      }
+    }
+    if (gcFn) {
+      try {
+        gcFn();
+      } catch {
+      }
+    }
+  };
   let idleSweepTimer = null;
-  if (idleSweepIntervalMs > 0 && (idleTimeoutMs > 0 || maxActiveProcesses > 0)) {
+  if (idleSweepIntervalMs > 0 && (idleTimeoutMs > 0 || maxActiveProcesses > 0 || sessionEvictMs > 0)) {
     idleSweepTimer = setInterval(async () => {
       try {
         let totalSwept = 0;
@@ -7970,7 +8106,18 @@ async function start(opts = {}) {
             swept.forEach(broadcastShrink);
             totalSwept += swept.length;
           }
+          if (sessionEvictMs > 0 && typeof provider.listEvictableSessions === "function") {
+            const evictable = provider.listEvictableSessions(sessionEvictMs);
+            for (const id of evictable) {
+              await sessionManager.killSession(id);
+            }
+            if (evictable.length > 0) {
+              console.log(`[Server] Idle GC: evicted ${evictable.length} stale session(s)`);
+              totalSwept += evictable.length;
+            }
+          }
         }
+        const hasRunning = sessionManager.getActiveSessions().some((s) => s.status === "running");
         if (totalSwept > 0) {
           console.log(`[Server] Idle GC: swept ${totalSwept} idle session(s)`);
           wsBridge.broadcast({
@@ -7978,6 +8125,9 @@ async function start(opts = {}) {
             sessions: sessionManager.getActiveSessions()
           });
         }
+        if (totalSwept > 0 || !hasRunning) {
+          maybeGc();
+        }
       } catch (err) {
         console.error("[Server] Idle GC failed:", err);
       }

package/dist/server.js

@@ -313,6 +313,8 @@ var import_node_os9 = require("os");
 var import_node_path9 = require("path");
 var import_node_child_process12 = require("child_process");
 var import_node_util3 = require("util");
+var import_node_v8 = require("v8");
+var import_node_vm = require("vm");
 
 // src/providers/ProcessProvider.ts
 var import_child_process = require("child_process");
@@ -455,26 +457,33 @@ function getSessionFilePath(projectPath, sessionId) {
 }
 async function getSessionModel(projectPath, sessionId) {
   const filePath = getSessionFilePath(projectPath, sessionId);
-  const raw = await (0, import_promises.readFile)(filePath, "utf-8").catch((err) => {
-    if (err.code === "ENOENT") return null;
-    throw err;
-  });
-  if (raw === null) return void 0;
-  const lines = raw.split("\n");
-  for (let i = lines.length - 1; i >= 0; i--) {
-    const line = lines[i].trim();
-    if (!line) continue;
-    try {
-      const obj = JSON.parse(line);
-      if (obj.type !== "assistant" || !obj.message) continue;
-      const model = obj.message.model;
-      if (typeof model === "string" && model && model !== "unknown") {
-        return model;
+  let fileHandle;
+  try {
+    fileHandle = await (0, import_promises.open)(filePath, "r");
+    const rl = (0, import_readline.createInterface)({
+      input: fileHandle.createReadStream({ encoding: "utf-8" }),
+      crlfDelay: Infinity
+    });
+    let lastModel;
+    for await (const line of rl) {
+      if (!line.trim()) continue;
+      try {
+        const obj = JSON.parse(line);
+        if (obj.type !== "assistant" || !obj.message) continue;
+        const model = obj.message.model;
+        if (typeof model === "string" && model && model !== "unknown") {
+          lastModel = model;
+        }
+      } catch {
       }
-    } catch {
     }
+    return lastModel;
+  } catch (err) {
+    if (err.code === "ENOENT") return void 0;
+    throw err;
+  } finally {
+    await fileHandle?.close();
   }
-  return void 0;
 }
 async function getProjects() {
   try {
@@ -603,17 +612,23 @@ async function getHistoricalSessions(projectPath) {
   }
 }
 async function getSessionHistory(projectPath, sessionId) {
+  let fileHandle;
   try {
     const encodedPath = encodeDirName(projectPath);
     const filePath = (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodedPath, `${sessionId}.jsonl`);
-    const raw = await (0, import_promises.readFile)(filePath, "utf-8").catch((err) => {
-      if (err.code === "ENOENT") return null;
+    try {
+      fileHandle = await (0, import_promises.open)(filePath, "r");
+    } catch (err) {
+      if (err.code === "ENOENT") return { ok: true, value: [] };
       throw err;
+    }
+    const rl = (0, import_readline.createInterface)({
+      input: fileHandle.createReadStream({ encoding: "utf-8" }),
+      crlfDelay: Infinity
     });
-    if (raw === null) return { ok: true, value: [] };
-    const lines = raw.split("\n").filter((l) => l.trim());
     const events = [];
-    for (const line of lines) {
+    for await (const line of rl) {
+      if (!line.trim()) continue;
       try {
         const obj = JSON.parse(line);
         const type = obj.type;
@@ -686,6 +701,8 @@ async function getSessionHistory(projectPath, sessionId) {
       ok: false,
       error: err instanceof Error ? err : new Error(String(err))
     };
+  } finally {
+    await fileHandle?.close();
   }
 }
 async function extractLastTimestamp(filePath) {
@@ -1030,6 +1047,27 @@ var ProcessProvider = class {
     }
     return swept;
   }
+  /**
+   * 枚举可淘汰的老会话
+   *
+   * 进程已退出（已被空闲 GC kill）且空闲超过 maxIdleMs 的会话——其 entry 与各 Map
+   * 仍长期占内存。调用方对返回 id 执行 killSession 彻底清除；淘汰后手机端发消息
+   * 会自动走 resume 路径（--resume + JSONL），不影响继续对话。
+   *
+   * @returns 可淘汰的 sessionId 列表（仅枚举，不删除）
+   */
+  listEvictableSessions(maxIdleMs) {
+    if (maxIdleMs <= 0) return [];
+    const now = Date.now();
+    const evictable = [];
+    for (const [sessionId, entry] of this.activeSessions) {
+      if (entry.process.exitCode === null && entry.process.signalCode === null) continue;
+      if (entry.session.status === "running" || entry.session.status === "waiting_question" || entry.session.status === "waiting_approval") continue;
+      if (now - entry.session.lastActiveAt < maxIdleMs) continue;
+      evictable.push(sessionId);
+    }
+    return evictable;
+  }
   // ============================================
   // 私有方法
   // ============================================
@@ -2046,10 +2084,18 @@ var SessionManager = class {
   sessionAgentType = /* @__PURE__ */ new Map();
   /** 事件回调列表（事件会被转发到 WsBridge） */
   eventCallbacks = [];
+  /** 会话被移除（kill / 淘汰）时的回调列表（用于释放外部模块的会话级状态，如 NotificationService） */
+  sessionRemovedCallbacks = [];
   /** 每个会话的事件流取消订阅函数 */
   unsubscribeMap = /* @__PURE__ */ new Map();
   /** 每个会话的事件缓冲区（用于新订阅者重放）*/
   sessionEventBuffers = /* @__PURE__ */ new Map();
+  /**
+   * 每个会话最近一次 AskUserQuestion tool_use 的真实 id（从 claude_event 流捕获）。
+   * PreToolUse hook payload 不含 tool_use_id，但内联卡片需要它来匹配状态，
+   * 故在转发流事件时记录，askQuestion 时兜底回填。
+   */
+  lastAskQuestionToolUseId = /* @__PURE__ */ new Map();
   /** AskUserQuestion 问题映射：requestId → resolve 回调 + 原始问题内容 */
   pendingQuestions = /* @__PURE__ */ new Map();
   /**
@@ -2158,6 +2204,7 @@ var SessionManager = class {
     this.bufferTruncated.delete(sessionId);
     this.sessionProjectPaths.delete(sessionId);
     this.sessionStats.delete(sessionId);
+    this.lastAskQuestionToolUseId.delete(sessionId);
     const pending = this.pendingAssistantEvents.get(sessionId);
     if (pending) {
       clearTimeout(pending.timer);
@@ -2166,6 +2213,13 @@ var SessionManager = class {
     const provider = this.getProviderForSession(sessionId);
     await provider.killSession(sessionId);
     this.sessionAgentType.delete(sessionId);
+    for (const cb of this.sessionRemovedCallbacks) {
+      try {
+        cb(sessionId);
+      } catch (err) {
+        console.error("[SessionManager] sessionRemoved callback failed:", err);
+      }
+    }
     console.log(`[SessionManager] Session killed: ${sessionId}`);
   }
   /**
@@ -2356,6 +2410,21 @@ var SessionManager = class {
       }
     };
   }
+  /**
+   * 注册"会话被移除"回调（会话 kill 或淘汰时触发，传入 sessionId）。
+   * 用于让外部模块释放会话级状态，如 NotificationService.releaseSession。
+   *
+   * @returns 取消注册的函数
+   */
+  onSessionRemoved(callback) {
+    this.sessionRemovedCallbacks.push(callback);
+    return () => {
+      const index = this.sessionRemovedCallbacks.indexOf(callback);
+      if (index !== -1) {
+        this.sessionRemovedCallbacks.splice(index, 1);
+      }
+    };
+  }
   /**
    * 清理所有资源
    */
@@ -2379,6 +2448,7 @@ var SessionManager = class {
     this.pendingQuestions.clear();
     this.lastBroadcastStatus.clear();
     this.eventCallbacks.length = 0;
+    this.sessionRemovedCallbacks.length = 0;
     console.log("[SessionManager] Destroyed");
   }
   // ============================================
@@ -2427,6 +2497,13 @@ var SessionManager = class {
         console.log(`[SessionManager] \u{1F9E0} thinking block detected in ${sessionId}: msgId=${event.message.id}, blocks=${thinkingBlocks.length}, len=${thinkingBlocks.map((b) => (b.thinking || "").length).join(",")}`);
       }
     }
+    if (event.type === "assistant" && Array.isArray(event.message?.content)) {
+      for (const block of event.message.content) {
+        if (block.type === "tool_use" && (block.name === "AskUserQuestion" || block.name === "AskFollowupQuestion") && typeof block.id === "string") {
+          this.lastAskQuestionToolUseId.set(sessionId, block.id);
+        }
+      }
+    }
     switch (event.type) {
       case "assistant":
         this.bufferAssistantEvent(sessionId, event);
@@ -2547,10 +2624,11 @@ var SessionManager = class {
    * 返回的 Promise 在 handleQuestionResponse 时 resolve。
    */
   askQuestion(sessionId, toolUseId, questions, requestId) {
+    const resolvedToolUseId = toolUseId || this.lastAskQuestionToolUseId.get(sessionId) || "";
     const request = {
       id: requestId,
       sessionId,
-      toolUseId,
+      toolUseId: resolvedToolUseId,
       question: questions[0]?.question ?? "",
       options: questions[0]?.options?.map((o) => o.label),
       questions,
@@ -2562,7 +2640,7 @@ var SessionManager = class {
     return new Promise((resolve) => {
       this.pendingQuestions.set(requestId, {
         sessionId,
-        toolUseId,
+        toolUseId: resolvedToolUseId,
         question: request.question,
         options: request.options,
         questions,
@@ -4084,7 +4162,8 @@ var HookInstaller = class {
     const isLatestVersion = approvalScriptContent.includes("permissionDecision") && approvalScriptContent.includes("Sessix Approval Hook v2");
     const settings = await this.readClaudeSettings();
     const configExists = this.hasHookConfig(settings);
-    return isLatestVersion && permissionScriptExists && compactScriptExists && postCompactScriptExists && permissionDeniedScriptExists && configExists;
+    const hasLegacyHook = this.hasHookEntry(settings?.hooks?.PreToolUse, LEGACY_HOOK_COMMANDS[0]) || this.hasHookEntry(settings?.hooks?.PermissionRequest, LEGACY_HOOK_COMMANDS[1]);
+    return isLatestVersion && permissionScriptExists && compactScriptExists && postCompactScriptExists && permissionDeniedScriptExists && configExists && !hasLegacyHook;
   }
   // ============================================
   // 内部方法
@@ -4096,8 +4175,14 @@ var HookInstaller = class {
     let settings = await this.readClaudeSettings();
     let changed = false;
     for (const cmd of LEGACY_HOOK_COMMANDS) {
-      this.removeHookCommand(settings, "PreToolUse", cmd);
-      this.removeHookCommand(settings, "PermissionRequest", cmd);
+      if (this.hasHookEntry(settings?.hooks?.PreToolUse, cmd)) {
+        this.removeHookCommand(settings, "PreToolUse", cmd);
+        changed = true;
+      }
+      if (this.hasHookEntry(settings?.hooks?.PermissionRequest, cmd)) {
+        this.removeHookCommand(settings, "PermissionRequest", cmd);
+        changed = true;
+      }
     }
     if (!settings.hooks) {
       settings.hooks = {};
@@ -4494,12 +4579,40 @@ var NotificationService = class _NotificationService {
     this.latestAssistantText.clear();
     for (const timer of this.activityPushTimers.values()) clearTimeout(timer);
     this.activityPushTimers.clear();
+    for (const timer of this.idleEndTimers.values()) clearTimeout(timer);
+    this.idleEndTimers.clear();
+    for (const timer of this.laHeartbeatTimers.values()) clearInterval(timer);
+    this.laHeartbeatTimers.clear();
     this.recentActivityState.clear();
     this.lastActivityPushAt.clear();
     this.pendingPriority.clear();
     this.activityCounters.clear();
     this.lastPushedFingerprint.clear();
   }
+  /**
+   * 释放单个会话的全部内存状态（会话被 kill 或淘汰时调用）。
+   * 由 SessionManager.onSessionRemoved 钩子触发，覆盖用户主动 kill 和自动淘汰两条路径。
+   * 幂等：重复调用或对未知会话调用都安全。
+   */
+  releaseSession(sessionId) {
+    this.clearActivityPushTimer(sessionId);
+    this.cancelIdleEndTimer(sessionId);
+    this.stopLaHeartbeat(sessionId);
+    this.clearSessionActivityState(sessionId);
+    this.yoloModeState.delete(sessionId);
+    this.lastActivityPushAt.delete(sessionId);
+    this.lastPushedFingerprint.delete(sessionId);
+    this.pendingPriority.delete(sessionId);
+  }
+  /**
+   * 清空单会话可重建的重状态（recentActivity / 计数器 / 最新文本）。
+   * 会话走到 idle 时调用即可释放内存——resume 后这些状态会随新事件自动重建。
+   */
+  clearSessionActivityState(sessionId) {
+    this.recentActivityState.delete(sessionId);
+    this.activityCounters.delete(sessionId);
+    this.latestAssistantText.delete(sessionId);
+  }
   // ============================================
   // 内部方法
   // ============================================
@@ -4537,6 +4650,7 @@ var NotificationService = class _NotificationService {
               badge: this.getGlobalPendingCount(),
               data: { type: "task_complete", sessionId: event.sessionId }
             });
+            this.clearSessionActivityState(event.sessionId);
           }
         } else if (event.status === "running" || event.status === "waiting_approval" || event.status === "waiting_question") {
           this.cancelIdleEndTimer(event.sessionId);
@@ -4825,9 +4939,8 @@ var NotificationService = class _NotificationService {
       });
     }
     this.stopLaHeartbeat(sessionId);
-    this.recentActivityState.delete(sessionId);
+    this.clearSessionActivityState(sessionId);
     this.lastActivityPushAt.delete(sessionId);
-    this.activityCounters.delete(sessionId);
     this.lastPushedFingerprint.delete(sessionId);
     console.log(`[NotificationService] \u{1F3C1} LA end (${reason}) session=${sessionId.slice(0, 8)}\u2026`);
   }
@@ -5928,7 +6041,6 @@ var SKIP_DIRS = /* @__PURE__ */ new Set([
   "DerivedData",
   "Pods",
   ".build",
-  "build",
   "dist",
   "__pycache__",
   ".next",
@@ -7096,10 +7208,11 @@ function isValidTask(value) {
 // src/utils/cliCapabilities.ts
 var import_node_child_process11 = require("child_process");
 var DEFAULT_MODELS = [
-  { value: "opus", label: "Opus 4.7", sublabel: "Most capable for ambitious work" },
-  { value: "claude-opus-4-6", label: "Opus 4.6", sublabel: "Previous generation flagship" },
-  { value: "sonnet", label: "Sonnet 4.6", sublabel: "Most efficient for everyday tasks" },
-  { value: "haiku", label: "Haiku 4.5", sublabel: "Fastest for quick answers" }
+  { value: "opus", label: "Opus 4.8", sublabel: "Most capable for ambitious work", maxEffort: "max", defaultEffort: "xhigh" },
+  { value: "claude-opus-4-7", label: "Opus 4.7", sublabel: "Previous generation flagship", maxEffort: "max", defaultEffort: "xhigh" },
+  { value: "claude-opus-4-6", label: "Opus 4.6", sublabel: "Earlier generation flagship", maxEffort: "max", defaultEffort: "xhigh" },
+  { value: "sonnet", label: "Sonnet 4.6", sublabel: "Most efficient for everyday tasks", maxEffort: "high", defaultEffort: "high" },
+  { value: "haiku", label: "Haiku 4.5", sublabel: "Fastest for quick answers", maxEffort: "medium", defaultEffort: "medium" }
 ];
 var DEFAULT_CAPABILITIES = {
   effortLevels: ["low", "medium", "high", "xhigh", "max"],
@@ -7267,6 +7380,7 @@ async function start(opts = {}) {
   const notificationService = new NotificationService(sessionManager, expoChannel);
   notificationService.addChannel("expo", expoChannel, opts.enableExpoPush !== false);
   notificationService.addChannel("mac", new DesktopNotificationChannel(), opts.enableMacNotification !== false);
+  sessionManager.onSessionRemoved((sessionId) => notificationService.releaseSession(sessionId));
   const activityPushOpts = opts.activityPush ?? await loadApnsConfigFromFile();
   if (activityPushOpts) {
     try {
@@ -7955,8 +8069,30 @@ async function start(opts = {}) {
   const idleTimeoutMs = Number(process.env.SESSIX_IDLE_TIMEOUT_MS ?? 30 * 60 * 1e3);
   const idleSweepIntervalMs = Number(process.env.SESSIX_IDLE_SWEEP_INTERVAL_MS ?? 5 * 60 * 1e3);
   const maxActiveProcesses = Number(process.env.SESSIX_MAX_ACTIVE_PROCESSES ?? 15);
+  const sessionEvictMs = Number(process.env.SESSIX_SESSION_EVICT_MS ?? 2 * 60 * 60 * 1e3);
+  let gcFn;
+  const maybeGc = () => {
+    if (gcFn === void 0) {
+      gcFn = globalThis.gc ?? null;
+      if (!gcFn) {
+        try {
+          (0, import_node_v8.setFlagsFromString)("--expose-gc");
+          const fn = (0, import_node_vm.runInNewContext)("gc");
+          gcFn = typeof fn === "function" ? fn : null;
+        } catch {
+          gcFn = null;
+        }
+      }
+    }
+    if (gcFn) {
+      try {
+        gcFn();
+      } catch {
+      }
+    }
+  };
   let idleSweepTimer = null;
-  if (idleSweepIntervalMs > 0 && (idleTimeoutMs > 0 || maxActiveProcesses > 0)) {
+  if (idleSweepIntervalMs > 0 && (idleTimeoutMs > 0 || maxActiveProcesses > 0 || sessionEvictMs > 0)) {
     idleSweepTimer = setInterval(async () => {
       try {
         let totalSwept = 0;
@@ -7975,7 +8111,18 @@ async function start(opts = {}) {
             swept.forEach(broadcastShrink);
             totalSwept += swept.length;
           }
+          if (sessionEvictMs > 0 && typeof provider.listEvictableSessions === "function") {
+            const evictable = provider.listEvictableSessions(sessionEvictMs);
+            for (const id of evictable) {
+              await sessionManager.killSession(id);
+            }
+            if (evictable.length > 0) {
+              console.log(`[Server] Idle GC: evicted ${evictable.length} stale session(s)`);
+              totalSwept += evictable.length;
+            }
+          }
         }
+        const hasRunning = sessionManager.getActiveSessions().some((s) => s.status === "running");
         if (totalSwept > 0) {
           console.log(`[Server] Idle GC: swept ${totalSwept} idle session(s)`);
           wsBridge.broadcast({
@@ -7983,6 +8130,9 @@ async function start(opts = {}) {
             sessions: sessionManager.getActiveSessions()
           });
         }
+        if (totalSwept > 0 || !hasRunning) {
+          maybeGc();
+        }
       } catch (err) {
         console.error("[Server] Idle GC failed:", err);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sessix-server",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "bin": {
     "sessix-server": "dist/index.js"
   },