sessix-server 0.4.3 → 0.4.5

package/dist/index.js

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_node_os10 = require("os");
 var import_node_fs4 = require("fs");
 var import_node_path10 = require("path");
-var import_node_child_process12 = require("child_process");
+var import_node_child_process13 = require("child_process");
 
 // src/i18n/locales/zh.ts
 var zh = {
@@ -306,7 +306,7 @@ var import_uuid9 = require("uuid");
 var import_promises7 = require("fs/promises");
 var import_node_os9 = require("os");
 var import_node_path9 = require("path");
-var import_node_child_process11 = require("child_process");
+var import_node_child_process12 = require("child_process");
 var import_node_util3 = require("util");
 
 // src/providers/ProcessProvider.ts
@@ -662,7 +662,24 @@ var ProcessProvider = class {
   writeUserMessage(proc, message, sessionId, images) {
     const content = [];
     if (images?.length) {
-      for (const img of images) {
+      const ALLOWED_TYPES = /* @__PURE__ */ new Set(["image/jpeg", "image/png", "image/webp", "image/gif"]);
+      const MAX_IMAGE_BYTES = 5 * 1024 * 1024;
+      for (let i = 0; i < images.length; i++) {
+        const img = images[i];
+        if (!ALLOWED_TYPES.has(img.media_type)) {
+          if (sessionId) {
+            this.emitWriteError(sessionId, `Image #${i + 1} rejected: unsupported media_type "${img.media_type}". Only JPEG/PNG/WebP/GIF are accepted.`);
+          }
+          return;
+        }
+        const sizeBytes = Math.floor(img.data.length * 0.75);
+        if (sizeBytes > MAX_IMAGE_BYTES) {
+          if (sessionId) {
+            const sizeMb = (sizeBytes / (1024 * 1024)).toFixed(1);
+            this.emitWriteError(sessionId, `Image #${i + 1} rejected: ${sizeMb}MB exceeds 5MB per-image limit.`);
+          }
+          return;
+        }
         content.push({
           type: "image",
           source: { type: "base64", media_type: img.media_type, data: img.data }
@@ -689,6 +706,14 @@ var ProcessProvider = class {
         this.emitWriteError(sessionId, `Failed to send message: ${err.message}`);
       }
     });
+    if (sessionId) {
+      const syntheticUser = {
+        type: "user",
+        session_id: sessionId,
+        message: { role: "user", content }
+      };
+      this.emitter.emit(this.getEventName(sessionId), syntheticUser);
+    }
   }
   /**
    * 发出写入失败的合成错误事件
@@ -3710,6 +3735,8 @@ var HookInstaller = class {
 
 // src/notification/NotificationService.ts
 var import_node_path5 = require("path");
+var RECENT_ACTIVITY_MAX = 6;
+var ACTIVITY_PUSH_THROTTLE_MS = 2500;
 var NotificationService = class {
   constructor(sessionManager, expoChannel = null) {
     this.sessionManager = sessionManager;
@@ -3728,6 +3755,14 @@ var NotificationService = class {
   latestAssistantText = /* @__PURE__ */ new Map();
   /** 获取全局待审批总数的回调（跨所有会话） */
   globalPendingCountProvider = null;
+  /** sessionId → 最近活动状态（用于 LA content push） */
+  recentActivityState = /* @__PURE__ */ new Map();
+  /** sessionId → 节流定时器（LA content push） */
+  activityPushTimers = /* @__PURE__ */ new Map();
+  /** 上次推送 LA content 的时间戳（用于节流；首次立即推送） */
+  lastActivityPushAt = /* @__PURE__ */ new Map();
+  /** 提供器：根据 sessionId 取该会话的待审批列表（由 server.ts 注入） */
+  pendingApprovalsProvider = null;
   /** 添加通知渠道（id 唯一，可用于后续动态开关） */
   addChannel(id, channel, enabled = true) {
     this.channelMap.set(id, { channel, enabled });
@@ -3755,11 +3790,24 @@ var NotificationService = class {
   }
   /** 注册 ActivityKit push token（由手机端启动 Live Activity 后上报） */
   addActivityPushToken(sessionId, token) {
-    this.activityPushChannel?.addToken(sessionId, token);
+    if (!this.activityPushChannel) {
+      console.warn(`[NotificationService] \u26A0\uFE0F  \u6536\u5230 LA push token \u4F46 ActivityPushChannel \u672A\u521D\u59CB\u5316 (session=${sessionId.slice(0, 8)}\u2026) \u2014 \u68C0\u67E5 ~/.sessix/apns.json`);
+      return;
+    }
+    this.activityPushChannel.addToken(sessionId, token);
+    console.log(`[NotificationService] \u2705 LA push token \u5DF2\u6CE8\u518C (session=${sessionId.slice(0, 8)}\u2026, token=${token.slice(0, 16)}\u2026)`);
+    this.scheduleActivityPush(sessionId, true);
   }
   /** 移除 ActivityKit push token */
   removeActivityPushToken(sessionId) {
     this.activityPushChannel?.removeToken(sessionId);
+    this.clearActivityPushTimer(sessionId);
+    this.recentActivityState.delete(sessionId);
+    this.lastActivityPushAt.delete(sessionId);
+  }
+  /** 注入"会话 → 待审批列表"提供器（server.ts 启动时调用） */
+  setPendingApprovalsProvider(fn) {
+    this.pendingApprovalsProvider = fn;
   }
   /** 设置全局待审批总数提供者 */
   setGlobalPendingCountProvider(provider) {
@@ -3782,12 +3830,15 @@ var NotificationService = class {
     if (this.activityPushChannel?.hasToken(request.sessionId)) {
       const dangerLevel2 = this.getDangerLevel(request.toolName);
       const isYoloMode = this.getYoloMode(request.sessionId);
+      const recentActivity = this.getRecentActivity(request.sessionId);
+      const latestMessage = recentActivity[recentActivity.length - 1] ?? "";
       this.activityPushChannel.updateActivityWithAlert(
         request.sessionId,
         {
           status: "waitingApproval",
           sessionTitle,
-          latestMessage: "",
+          latestMessage,
+          recentActivity,
           approvalInfo: {
             requestId: request.id,
             toolName: request.toolName,
@@ -3800,6 +3851,7 @@ var NotificationService = class {
         },
         { title, body }
       );
+      this.lastActivityPushAt.set(request.sessionId, Date.now());
       return;
     }
     const dangerLevel = this.getDangerLevel(request.toolName);
@@ -3833,17 +3885,20 @@ var NotificationService = class {
     const body = `\u2753 ${request.question.slice(0, 80)}`;
     if (this.activityPushChannel?.hasToken(request.sessionId)) {
       const isYoloMode = this.getYoloMode(request.sessionId);
+      const recentActivity = this.getRecentActivity(request.sessionId);
       this.activityPushChannel.updateActivityWithAlert(
         request.sessionId,
         {
           status: "waitingApproval",
           sessionTitle,
           latestMessage: request.question.slice(0, 80),
+          recentActivity,
           isYoloMode,
           updatedAt: Date.now()
         },
         { title: sessionTitle, body }
       );
+      this.lastActivityPushAt.set(request.sessionId, Date.now());
       return;
     }
     this.notify({
@@ -3877,6 +3932,10 @@ var NotificationService = class {
     this.unsubscribe = null;
     this.yoloModeState.clear();
     this.latestAssistantText.clear();
+    for (const timer of this.activityPushTimers.values()) clearTimeout(timer);
+    this.activityPushTimers.clear();
+    this.recentActivityState.clear();
+    this.lastActivityPushAt.clear();
   }
   // ============================================
   // 内部方法
@@ -3885,15 +3944,20 @@ var NotificationService = class {
     switch (event.type) {
       case "claude_event": {
         this.trackAssistantText(event.sessionId, event.event);
+        this.updateRecentActivity(event.sessionId, event.event);
+        this.scheduleActivityPush(event.sessionId);
         break;
       }
       case "claude_events": {
         for (const e of event.events) {
           this.trackAssistantText(event.sessionId, e);
+          this.updateRecentActivity(event.sessionId, e);
         }
+        this.scheduleActivityPush(event.sessionId);
         break;
       }
       case "status_change": {
+        this.clearActivityPushTimer(event.sessionId);
         if (event.status === "idle") {
           const sessionTitle = this.getSessionTitle(event.sessionId);
           const latestMsg = this.latestAssistantText.get(event.sessionId);
@@ -3904,9 +3968,12 @@ var NotificationService = class {
               status: "idle",
               sessionTitle,
               latestMessage: body,
+              recentActivity: this.getRecentActivity(event.sessionId),
               isYoloMode,
               updatedAt: Date.now()
             });
+            this.recentActivityState.delete(event.sessionId);
+            this.lastActivityPushAt.delete(event.sessionId);
           } else {
             this.notify({
               title: sessionTitle,
@@ -3926,9 +3993,12 @@ var NotificationService = class {
               status: "error",
               sessionTitle,
               latestMessage: body,
+              recentActivity: this.getRecentActivity(event.sessionId),
               isYoloMode,
               updatedAt: Date.now()
             });
+            this.recentActivityState.delete(event.sessionId);
+            this.lastActivityPushAt.delete(event.sessionId);
           } else {
             this.notify({
               title: sessionTitle,
@@ -3970,6 +4040,229 @@ var NotificationService = class {
   getYoloMode(sessionId) {
     return this.yoloModeState.get(sessionId) ?? false;
   }
+  // ============================================
+  // Live Activity 内容推送（后台 LA 实时刷新）
+  // ============================================
+  /**
+   * 把一个 ClaudeStreamEvent 折算到 recentActivity 列表里。
+   * 同一 message.id 内多次 assistant 事件视为流式更新，整段重建 currentEntries；
+   * 切换 message.id 视为新 turn，旧条目沉淀到 history。
+   */
+  updateRecentActivity(sessionId, event) {
+    if (event.type === "result") {
+      const state2 = this.recentActivityState.get(sessionId);
+      if (state2 && state2.currentEntries.length > 0) {
+        state2.history.push(...state2.currentEntries);
+        while (state2.history.length > RECENT_ACTIVITY_MAX) state2.history.shift();
+        state2.currentEntries = [];
+        state2.currentMessageId = null;
+      }
+      return;
+    }
+    if (event.type !== "assistant") return;
+    const msg = event.message;
+    if (!Array.isArray(msg.content)) return;
+    let state = this.recentActivityState.get(sessionId);
+    if (!state) {
+      state = { history: [], currentMessageId: null, currentEntries: [] };
+      this.recentActivityState.set(sessionId, state);
+    }
+    if (state.currentMessageId !== msg.id) {
+      if (state.currentEntries.length > 0) {
+        state.history.push(...state.currentEntries);
+        while (state.history.length > RECENT_ACTIVITY_MAX) state.history.shift();
+      }
+      state.currentEntries = [];
+      state.currentMessageId = msg.id;
+    }
+    const next = [];
+    for (const block of msg.content) {
+      if (block.type === "text") {
+        const line = this.summarizeText(block.text);
+        if (line.length >= 4) next.push(line);
+      } else if (block.type === "tool_use") {
+        const line = this.summarizeToolCall(block.name, block.input ?? {});
+        if (line) next.push(line);
+      }
+    }
+    state.currentEntries = next;
+  }
+  /** 取该会话当前的 recentActivity（history + currentEntries），保留末尾 N 条 */
+  getRecentActivity(sessionId) {
+    const state = this.recentActivityState.get(sessionId);
+    if (!state) return [];
+    const combined = [...state.history, ...state.currentEntries];
+    return combined.slice(-RECENT_ACTIVITY_MAX);
+  }
+  /** 节流调度 LA content push；首次立即推，后续合并到 throttle window 末尾 */
+  scheduleActivityPush(sessionId, force = false) {
+    if (!this.activityPushChannel?.hasToken(sessionId)) return;
+    const now = Date.now();
+    const last = this.lastActivityPushAt.get(sessionId) ?? 0;
+    const elapsed = now - last;
+    if (force || elapsed >= ACTIVITY_PUSH_THROTTLE_MS) {
+      this.clearActivityPushTimer(sessionId);
+      this.flushActivityPush(sessionId);
+      return;
+    }
+    if (this.activityPushTimers.has(sessionId)) return;
+    const wait = ACTIVITY_PUSH_THROTTLE_MS - elapsed;
+    this.activityPushTimers.set(
+      sessionId,
+      setTimeout(() => {
+        this.activityPushTimers.delete(sessionId);
+        this.flushActivityPush(sessionId);
+      }, wait)
+    );
+  }
+  clearActivityPushTimer(sessionId) {
+    const timer = this.activityPushTimers.get(sessionId);
+    if (timer) {
+      clearTimeout(timer);
+      this.activityPushTimers.delete(sessionId);
+    }
+  }
+  /** 真正发送一次 LA content push（无 alert） */
+  flushActivityPush(sessionId) {
+    const channel = this.activityPushChannel;
+    if (!channel?.hasToken(sessionId)) return;
+    const session = this.sessionManager.getActiveSessions().find((s) => s.id === sessionId);
+    if (!session) return;
+    const recentActivity = this.getRecentActivity(sessionId);
+    const latestMessage = recentActivity[recentActivity.length - 1] ?? this.latestAssistantText.get(sessionId) ?? "";
+    const sessionTitle = this.getSessionTitle(sessionId);
+    const isYoloMode = this.getYoloMode(sessionId);
+    const pendingApprovals = this.pendingApprovalsProvider?.(sessionId) ?? [];
+    const latestApproval = pendingApprovals[pendingApprovals.length - 1];
+    const status = latestApproval ? "waitingApproval" : this.mapSessionStatus(session.status);
+    const contentState = {
+      status,
+      sessionTitle,
+      latestMessage,
+      recentActivity,
+      isYoloMode,
+      updatedAt: Date.now()
+    };
+    if (latestApproval) {
+      contentState.approvalInfo = {
+        requestId: latestApproval.id,
+        toolName: latestApproval.toolName,
+        description: String(latestApproval.description ?? "").slice(0, 80),
+        dangerLevel: this.getDangerLevel(latestApproval.toolName),
+        pendingCount: pendingApprovals.length
+      };
+    }
+    if (session.stats) {
+      contentState.stats = {
+        totalInputTokens: session.stats.totalInputTokens,
+        totalOutputTokens: session.stats.totalOutputTokens,
+        totalCostUsd: session.stats.totalCostUsd
+      };
+    }
+    this.lastActivityPushAt.set(sessionId, Date.now());
+    const lineCount = recentActivity.length;
+    channel.updateActivity(sessionId, contentState).then(() => {
+      console.log(`[NotificationService] \u{1F4E1} LA push \u2713 session=${sessionId.slice(0, 8)}\u2026 status=${status} lines=${lineCount}`);
+    }).catch((err) => {
+      console.warn(`[NotificationService] \u{1F4E1} LA push \u2717 session=${sessionId.slice(0, 8)}\u2026:`, err instanceof Error ? err.message : err);
+    });
+  }
+  /** SessionStatus → LiveActivity status 字符串映射（与客户端 mapStatus 一致） */
+  mapSessionStatus(status) {
+    switch (status) {
+      case "running":
+        return "running";
+      case "waiting_approval":
+        return "waitingApproval";
+      case "waiting_question":
+        return "waitingQuestion";
+      case "idle":
+        return "completed";
+      case "completed":
+        return "completed";
+      case "error":
+        return "error";
+      default:
+        return "idle";
+    }
+  }
+  /** 文本块清洗：去多余空白 + 截断到 70 字符 */
+  summarizeText(raw) {
+    if (typeof raw !== "string") return "";
+    const cleaned = raw.replace(/\s+/g, " ").trim();
+    return cleaned.length > 70 ? cleaned.slice(0, 70) + "\u2026" : cleaned;
+  }
+  /** 工具调用摘要（与客户端 summarizeToolCall 行为对齐，简化版只输出中文） */
+  summarizeToolCall(name, input) {
+    const str = (v) => typeof v === "string" ? v : "";
+    const baseName = (p) => {
+      const cleaned = p.split(/[?#]/)[0];
+      const parts = cleaned.split("/");
+      return parts[parts.length - 1] || cleaned;
+    };
+    const trunc = (s, n) => s.length > n ? s.slice(0, n) + "\u2026" : s;
+    switch (name) {
+      case "Bash": {
+        const cmd = str(input.command).split("\n")[0];
+        return cmd ? `\u8FD0\u884C: ${trunc(cmd, 60)}` : "\u6267\u884C\u547D\u4EE4";
+      }
+      case "Edit": {
+        const fp = baseName(str(input.file_path));
+        return fp ? `\u7F16\u8F91 ${fp}` : "\u7F16\u8F91\u6587\u4EF6";
+      }
+      case "MultiEdit": {
+        const fp = baseName(str(input.file_path));
+        return fp ? `\u6279\u91CF\u7F16\u8F91 ${fp}` : "\u6279\u91CF\u7F16\u8F91\u6587\u4EF6";
+      }
+      case "Write": {
+        const fp = baseName(str(input.file_path));
+        return fp ? `\u5199\u5165 ${fp}` : "\u5199\u5165\u6587\u4EF6";
+      }
+      case "Read":
+      case "NotebookEdit": {
+        const fp = baseName(str(input.file_path) || str(input.notebook_path));
+        return fp ? `\u9605\u8BFB ${fp}` : "\u9605\u8BFB\u6587\u4EF6";
+      }
+      case "Grep": {
+        const p = str(input.pattern);
+        return p ? `\u641C\u7D22: ${trunc(p, 50)}` : "\u641C\u7D22\u4EE3\u7801";
+      }
+      case "Glob": {
+        const p = str(input.pattern);
+        return p ? `\u67E5\u627E: ${trunc(p, 50)}` : "\u67E5\u627E\u6587\u4EF6";
+      }
+      case "WebFetch": {
+        const url = str(input.url);
+        let host = url;
+        try {
+          host = new URL(url).hostname;
+        } catch {
+        }
+        return host ? `\u8BF7\u6C42 ${trunc(host, 50)}` : "\u8BF7\u6C42\u7F51\u9875";
+      }
+      case "WebSearch": {
+        const q = str(input.query);
+        return q ? `\u641C\u7D22\u7F51\u9875: ${trunc(q, 50)}` : "\u641C\u7D22\u7F51\u9875";
+      }
+      case "TodoWrite":
+        return "\u66F4\u65B0\u4EFB\u52A1\u6E05\u5355";
+      case "Task":
+      case "Agent": {
+        const desc = str(input.description) || str(input.subagent_type);
+        return desc ? `\u6D3E\u53D1\u4EFB\u52A1: ${trunc(desc, 50)}` : "\u6D3E\u53D1\u5B50\u4EFB\u52A1";
+      }
+      case "ExitPlanMode":
+        return "\u63D0\u4EA4\u8BA1\u5212";
+      case "Skill": {
+        const skill = str(input.skill);
+        return skill ? `\u8C03\u7528\u6280\u80FD: ${trunc(skill, 40)}` : "\u8C03\u7528\u6280\u80FD";
+      }
+      default: {
+        const summary = trunc(JSON.stringify(input), 50);
+        return name ? `${name}: ${summary}` : summary;
+      }
+    }
+  }
 };
 
 // src/notification/DesktopNotificationChannel.ts
@@ -4083,62 +4376,82 @@ var ExpoNotificationChannel = class {
 var http2 = __toESM(require("http2"));
 var fs2 = __toESM(require("fs"));
 var crypto = __toESM(require("crypto"));
+var APNS_HOSTS = {
+  production: "api.push.apple.com",
+  sandbox: "api.sandbox.push.apple.com"
+};
 var ActivityPushChannel = class {
   /** sessionId -> activityPushToken */
   tokens = /* @__PURE__ */ new Map();
+  /**
+   * 每个 token 已确认工作的 APNs 环境。
+   * Debug build (aps-environment=development) 的 token 仅在 sandbox 端有效；
+   * Release build (aps-environment=production) 的 token 仅在 production 端有效。
+   * 同时维护两个连接 + 探测机制，避免环境配错时静默失败。
+   */
+  tokenEnv = /* @__PURE__ */ new Map();
+  /** 首次探测顺序（来自配置 hint），未配置则先试 sandbox（开发场景占多数） */
+  probeOrder;
   teamId;
   keyId;
   authKey;
-  apnsHost;
   /** 缓存的 JWT token + 过期时间 */
   cachedJwt = null;
-  /** 复用的 HTTP/2 长连接 */
-  http2Client = null;
+  /** 每个环境一条 HTTP/2 长连接 */
+  http2Clients = {};
   constructor(config) {
     this.teamId = config.teamId;
     this.keyId = config.keyId;
     this.authKey = fs2.readFileSync(config.authKeyPath, "utf-8");
-    this.apnsHost = config.sandbox ? "api.sandbox.push.apple.com" : "api.push.apple.com";
-    console.log(`[ActivityPushChannel] Initialized (${config.sandbox ? "sandbox" : "production"} mode)`);
-  }
-  /** 获取或新建 HTTP/2 长连接 */
-  getHttp2Client() {
-    if (this.http2Client && !this.http2Client.destroyed && !this.http2Client.closed) {
-      return this.http2Client;
-    }
-    this.http2Client = http2.connect(`https://${this.apnsHost}`);
-    this.http2Client.on("error", (err) => {
-      console.warn("[ActivityPushChannel] HTTP/2 connection error, will reconnect on next request:", err.message);
-      this.http2Client?.destroy();
-      this.http2Client = null;
+    this.probeOrder = config.sandbox === false ? ["production", "sandbox"] : ["sandbox", "production"];
+    console.log(`[ActivityPushChannel] Initialized (probe order: ${this.probeOrder.join(" \u2192 ")})`);
+  }
+  /** 获取或新建指定环境的 HTTP/2 长连接 */
+  getHttp2Client(env) {
+    const existing = this.http2Clients[env];
+    if (existing && !existing.destroyed && !existing.closed) {
+      return existing;
+    }
+    const client = http2.connect(`https://${APNS_HOSTS[env]}`);
+    client.on("error", (err) => {
+      console.warn(`[ActivityPushChannel] HTTP/2 (${env}) error, will reconnect on next request:`, err.message);
+      client.destroy();
+      if (this.http2Clients[env] === client) delete this.http2Clients[env];
     });
-    this.http2Client.on("close", () => {
-      this.http2Client = null;
+    client.on("close", () => {
+      if (this.http2Clients[env] === client) delete this.http2Clients[env];
     });
-    return this.http2Client;
+    this.http2Clients[env] = client;
+    return client;
   }
   /** 注册 Activity push token */
   addToken(sessionId, token) {
+    const existed = this.tokens.has(sessionId);
     this.tokens.set(sessionId, token);
-    console.log(`[ActivityPushChannel] Token registered: session=${sessionId}`);
+    console.log(`[ActivityPushChannel] Token ${existed ? "updated" : "registered"}: session=${sessionId.slice(0, 8)}\u2026 token=${token.slice(0, 16)}\u2026`);
   }
   /** 移除 Activity push token */
   removeToken(sessionId) {
+    const tok = this.tokens.get(sessionId);
     this.tokens.delete(sessionId);
+    if (tok) this.tokenEnv.delete(tok);
   }
-  /** 发送 content-state 更新到指定会话的 Live Activity */
+  /** 发送 content-state 更新到指定会话的 Live Activity（纯内容刷新，不响通知） */
   async updateActivity(sessionId, contentState) {
     const token = this.tokens.get(sessionId);
     if (!token) return;
+    const now = Math.floor(Date.now() / 1e3);
     const payload = {
       aps: {
-        timestamp: Math.floor(Date.now() / 1e3),
+        timestamp: now,
         event: "update",
-        "content-state": contentState
+        "content-state": contentState,
+        // 2 分钟没新内容就让 LA 进入 stale 状态（系统自动灰化），避免显示陈旧数据
+        "stale-date": now + 120
       }
     };
     try {
-      await this.sendToAPNs(token, payload);
+      await this.sendToAPNs(token, payload, { priority: "5" });
     } catch (err) {
       console.warn(`[ActivityPushChannel] Update failed session=${sessionId}:`, err);
     }
@@ -4147,17 +4460,19 @@ var ActivityPushChannel = class {
   async updateActivityWithAlert(sessionId, contentState, alert) {
     const token = this.tokens.get(sessionId);
     if (!token) return;
+    const now = Math.floor(Date.now() / 1e3);
     const payload = {
       aps: {
-        timestamp: Math.floor(Date.now() / 1e3),
+        timestamp: now,
         event: "update",
         "content-state": contentState,
+        "stale-date": now + 120,
         alert,
         sound: "default"
       }
     };
     try {
-      await this.sendToAPNs(token, payload);
+      await this.sendToAPNs(token, payload, { priority: "10" });
     } catch (err) {
       console.warn(`[ActivityPushChannel] Alert update failed session=${sessionId}:`, err);
     }
@@ -4166,15 +4481,16 @@ var ActivityPushChannel = class {
   async endActivity(sessionId, contentState) {
     const token = this.tokens.get(sessionId);
     if (!token) return;
+    const now = Math.floor(Date.now() / 1e3);
     const payload = {
       aps: {
-        timestamp: Math.floor(Date.now() / 1e3),
+        timestamp: now,
         event: "end",
         "content-state": contentState
       }
     };
     try {
-      await this.sendToAPNs(token, payload);
+      await this.sendToAPNs(token, payload, { priority: "10" });
     } catch (err) {
       console.warn(`[ActivityPushChannel] End failed session=${sessionId}:`, err);
     }
@@ -4184,15 +4500,44 @@ var ActivityPushChannel = class {
   hasToken(sessionId) {
     return this.tokens.has(sessionId);
   }
-  /** 发送 APNs HTTP/2 请求 */
-  async sendToAPNs(deviceToken, payload) {
+  /**
+   * 发送 APNs，自动处理环境探测。
+   * 对每个 token：先用已确认的环境（如有）；否则按 probeOrder 顺序探测，
+   * 收到 BadDeviceToken 自动切到另一个环境，并把成功的环境绑定到该 token。
+   */
+  async sendToAPNs(deviceToken, payload, opts = {}) {
+    const known = this.tokenEnv.get(deviceToken);
+    if (known) {
+      return this.sendToAPNsOnce(deviceToken, payload, opts, known);
+    }
+    let lastErr = null;
+    for (const env of this.probeOrder) {
+      try {
+        await this.sendToAPNsOnce(deviceToken, payload, opts, env);
+        this.tokenEnv.set(deviceToken, env);
+        if (env !== this.probeOrder[0]) {
+          console.log(`[ActivityPushChannel] Token bound to ${env} after probe (token=${deviceToken.slice(0, 16)}\u2026)`);
+        }
+        return;
+      } catch (err) {
+        lastErr = err;
+        if (!isBadDeviceTokenError(err)) {
+          throw err;
+        }
+      }
+    }
+    throw lastErr ?? new Error("APNs send failed: all environments rejected token");
+  }
+  /** 单次 APNs HTTP/2 请求（内部 helper，不做探测） */
+  async sendToAPNsOnce(deviceToken, payload, opts, env) {
     const topic = "com.kachun.sessix.push-type.liveactivity";
     const jwt = this.getJWT();
     const payloadStr = JSON.stringify(payload);
+    const priority = opts.priority ?? "10";
     return new Promise((resolve, reject) => {
       let client;
       try {
-        client = this.getHttp2Client();
+        client = this.getHttp2Client(env);
       } catch (err) {
         return reject(err);
       }
@@ -4202,7 +4547,7 @@ var ActivityPushChannel = class {
         "authorization": `bearer ${jwt}`,
         "apns-topic": topic,
         "apns-push-type": "liveactivity",
-        "apns-priority": "10",
+        "apns-priority": priority,
         "apns-expiration": String(Math.floor(Date.now() / 1e3) + 30),
         "content-type": "application/json",
         "content-length": Buffer.byteLength(payloadStr)
@@ -4220,10 +4565,11 @@ var ActivityPushChannel = class {
           resolve();
         } else {
           if (statusCode === 0) {
-            this.http2Client?.destroy();
-            this.http2Client = null;
+            const c = this.http2Clients[env];
+            c?.destroy();
+            delete this.http2Clients[env];
           }
-          reject(new Error(`APNs returned ${statusCode}: ${responseData}`));
+          reject(new ApnsError(statusCode, responseData));
         }
       });
       req.on("error", (err) => {
@@ -4256,6 +4602,24 @@ var ActivityPushChannel = class {
     return token;
   }
 };
+var ApnsError = class extends Error {
+  constructor(statusCode, responseBody) {
+    super(`APNs returned ${statusCode}: ${responseBody}`);
+    this.statusCode = statusCode;
+    this.responseBody = responseBody;
+    this.name = "ApnsError";
+  }
+};
+function isBadDeviceTokenError(err) {
+  if (!(err instanceof ApnsError)) return false;
+  if (err.statusCode !== 400 && err.statusCode !== 410) return false;
+  try {
+    const parsed = JSON.parse(err.responseBody);
+    return parsed.reason === "BadDeviceToken" || parsed.reason === "Unregistered";
+  } catch {
+    return false;
+  }
+}
 
 // src/session/ProjectReader.ts
 var import_promises3 = require("fs/promises");
@@ -4655,6 +5019,45 @@ var PairingManager = class {
   }
 };
 
+// src/utils/shellPath.ts
+var import_node_child_process7 = require("child_process");
+var fixed = false;
+function fixShellPath() {
+  if (fixed || isWindows) {
+    fixed = true;
+    return;
+  }
+  fixed = true;
+  const shell = process.env.SHELL || "/bin/zsh";
+  const isFish = /\/fish$/.test(shell);
+  const printPathCmd = isFish ? "string join : $PATH" : 'printf "%s" "$PATH"';
+  let raw;
+  try {
+    raw = (0, import_node_child_process7.execFileSync)(shell, ["-l", "-c", printPathCmd], {
+      encoding: "utf8",
+      timeout: 3e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+  } catch (err) {
+    console.warn("[fixShellPath] failed to read login shell PATH:", err);
+    return;
+  }
+  const fromShell = raw.trim();
+  if (!fromShell) return;
+  process.env.PATH = mergePath(fromShell, process.env.PATH || "");
+}
+function mergePath(primary, secondary) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const seg of primary.split(":").concat(secondary.split(":"))) {
+    if (!seg) continue;
+    if (seen.has(seg)) continue;
+    seen.add(seg);
+    out.push(seg);
+  }
+  return out.join(":");
+}
+
 // src/auth/AuthManager.ts
 var import_child_process3 = require("child_process");
 var import_child_process4 = require("child_process");
@@ -4777,9 +5180,9 @@ var AuthManager = class extends import_events3.EventEmitter {
 var import_promises8 = require("fs/promises");
 
 // src/terminal/TerminalExecutor.ts
-var import_node_child_process7 = require("child_process");
+var import_node_child_process8 = require("child_process");
 var import_uuid5 = require("uuid");
-var EXEC_TIMEOUT_MS = 5 * 60 * 1e3;
+var EXEC_TIMEOUT_MS = 30 * 60 * 1e3;
 var TerminalExecutor = class {
   processes = /* @__PURE__ */ new Map();
   eventCallbacks = [];
@@ -4801,9 +5204,9 @@ var TerminalExecutor = class {
   }
   exec(sessionId, command, cwd) {
     const execId = (0, import_uuid5.v4)();
-    const shell = isWindows ? "powershell" : "bash";
-    const args = isWindows ? ["-Command", command] : ["-c", command];
-    const proc = (0, import_node_child_process7.spawn)(shell, args, {
+    const shell = isWindows ? "powershell" : process.env.SHELL || "/bin/zsh";
+    const args = isWindows ? ["-Command", command] : ["-l", "-c", command];
+    const proc = (0, import_node_child_process8.spawn)(shell, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env }
@@ -4840,6 +5243,14 @@ var TerminalExecutor = class {
     });
     const timer = setTimeout(() => {
       if (this.processes.has(execId)) {
+        this.emit({
+          type: "terminal_output",
+          sessionId,
+          execId,
+          stream: "stderr",
+          data: `[killed: timeout ${Math.round(EXEC_TIMEOUT_MS / 6e4)}m]
+`
+        });
         killProcessCrossPlatform(proc);
       }
     }, EXEC_TIMEOUT_MS);
@@ -4864,13 +5275,13 @@ var TerminalExecutor = class {
 };
 
 // src/xcode/XcodeBuildExecutor.ts
-var import_node_child_process8 = require("child_process");
+var import_node_child_process9 = require("child_process");
 var import_node_util = require("util");
 var import_promises4 = require("fs/promises");
 var import_node_path6 = require("path");
 var import_node_os7 = require("os");
 var import_uuid6 = require("uuid");
-var execAsync = (0, import_node_util.promisify)(import_node_child_process8.exec);
+var execAsync = (0, import_node_util.promisify)(import_node_child_process9.exec);
 var BUILD_TIMEOUT_MS = 30 * 60 * 1e3;
 var INSTALL_TIMEOUT_MS = 5 * 60 * 1e3;
 var CONFIG_FILE = (0, import_node_path6.join)((0, import_node_os7.homedir)(), ".sessix", "xcode-config.json");
@@ -5059,7 +5470,7 @@ ${e.stderr ?? ""}`);
     if (override) await this.saveConfig(projectPath, override);
     const buildId = (0, import_uuid6.v4)();
     const args = buildArgs(config);
-    const proc = (0, import_node_child_process8.spawn)("xcodebuild", args, {
+    const proc = (0, import_node_child_process9.spawn)("xcodebuild", args, {
       cwd: projectPath,
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env, NSUnbufferedIO: "YES" }
@@ -5155,7 +5566,7 @@ ${e.stderr ?? ""}`);
 
 `
     });
-    const proc = (0, import_node_child_process8.spawn)(installCmd[0], installCmd.slice(1), {
+    const proc = (0, import_node_child_process9.spawn)(installCmd[0], installCmd.slice(1), {
       cwd: projectPath,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -5562,15 +5973,16 @@ var CommandDiscovery = class {
         const cmd = sanitizeBashLine(rawLine);
         if (!cmd) continue;
         const { command: cleanCmd, inlineComment } = splitInlineComment(cmd);
-        const title = synthesizeTitle(cleanCmd);
+        const { cwd: cdCwd, command: finalCmd } = splitCdPrefix(cleanCmd);
+        const title = synthesizeTitle(finalCmd);
         out.push(makeCommand({
           title,
-          command: cleanCmd,
-          cwd: "",
+          command: finalCmd,
+          cwd: cdCwd,
           source,
           sourceFile: fileName,
           description: inlineComment ?? blockHeading,
-          category: classifyByCommand(cleanCmd)
+          category: classifyByCommand(finalCmd)
         }));
       }
     }
@@ -5615,6 +6027,19 @@ function synthesizeTitle(cmd) {
   const head = tokens.slice(0, 3).join(" ");
   return head.length > 60 ? head.slice(0, 60) + "\u2026" : head;
 }
+function splitCdPrefix(cmd) {
+  const m = /^cd\s+(\S+)\s*&&\s*(.+)$/.exec(cmd);
+  if (!m) return { cwd: "", command: cmd };
+  const path2 = m[1];
+  if (!path2) return { cwd: "", command: cmd };
+  if (path2.startsWith("/") || path2.startsWith("~") || path2.startsWith("-")) {
+    return { cwd: "", command: cmd };
+  }
+  if (path2.split("/").some((seg) => seg === "..")) {
+    return { cwd: "", command: cmd };
+  }
+  return { cwd: path2, command: m[2].trim() };
+}
 function splitInlineComment(line) {
   let inSingle = false;
   let inDouble = false;
@@ -5676,10 +6101,10 @@ function sourceWeight(s) {
 }
 
 // src/git/GitExecutor.ts
-var import_node_child_process9 = require("child_process");
+var import_node_child_process10 = require("child_process");
 var import_node_util2 = require("util");
 var import_uuid7 = require("uuid");
-var execAsync2 = (0, import_node_util2.promisify)(import_node_child_process9.exec);
+var execAsync2 = (0, import_node_util2.promisify)(import_node_child_process10.exec);
 var STATUS_TIMEOUT_MS = 15e3;
 var COMMIT_TIMEOUT_MS = 6e4;
 var PUSH_TIMEOUT_MS = 5 * 60 * 1e3;
@@ -5852,7 +6277,7 @@ var GitExecutor = class {
       });
       let proc;
       try {
-        proc = (0, import_node_child_process9.spawn)(cmd[0], cmd.slice(1), {
+        proc = (0, import_node_child_process10.spawn)(cmd[0], cmd.slice(1), {
           cwd: projectPath,
           stdio: ["ignore", "pipe", "pipe"],
           env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
@@ -6032,9 +6457,15 @@ function isValidTask(value) {
 }
 
 // src/utils/cliCapabilities.ts
-var import_node_child_process10 = require("child_process");
+var import_node_child_process11 = require("child_process");
+var DEFAULT_MODELS = [
+  { value: "opus", label: "Opus 4.7", sublabel: "Most capable for ambitious work" },
+  { value: "sonnet", label: "Sonnet 4.6", sublabel: "Most efficient for everyday tasks" },
+  { value: "haiku", label: "Haiku 4.5", sublabel: "Fastest for quick answers" }
+];
 var DEFAULT_CAPABILITIES = {
-  effortLevels: ["low", "medium", "high", "xhigh", "max"]
+  effortLevels: ["low", "medium", "high", "xhigh", "max"],
+  models: DEFAULT_MODELS
 };
 async function parseCliCapabilities() {
   const claudePath = findClaudePath();
@@ -6060,7 +6491,7 @@ async function parseCliCapabilities() {
 }
 function runCli(path2, args) {
   return new Promise((resolve) => {
-    (0, import_node_child_process10.execFile)(path2, args, { timeout: 5e3 }, (err, stdout) => {
+    (0, import_node_child_process11.execFile)(path2, args, { timeout: 5e3 }, (err, stdout) => {
       if (err) {
         console.warn(`[CliCapabilities] Failed to run ${path2} ${args.join(" ")}:`, err.message);
         resolve(null);
@@ -6074,7 +6505,7 @@ function runCli(path2, args) {
 // src/server.ts
 var WS_PORT = 3745;
 var HTTP_PORT = 3746;
-var execAsync3 = (0, import_node_util3.promisify)(import_node_child_process11.exec);
+var execAsync3 = (0, import_node_util3.promisify)(import_node_child_process12.exec);
 async function killPortProcess(port) {
   try {
     if (isWindows) {
@@ -6102,6 +6533,39 @@ async function killPortProcess(port) {
   } catch {
   }
 }
+async function loadApnsConfigFromFile() {
+  const path2 = (0, import_node_path9.join)((0, import_node_os9.homedir)(), ".sessix", "apns.json");
+  try {
+    const raw = await (0, import_promises7.readFile)(path2, "utf8");
+    const cfg = JSON.parse(raw);
+    if (typeof cfg.teamId !== "string" || typeof cfg.keyId !== "string" || typeof cfg.authKeyPath !== "string") {
+      console.warn(`[Server] \u26A0\uFE0F  ${path2} \u7F3A\u5C11\u5FC5\u9700\u5B57\u6BB5 (teamId / keyId / authKeyPath)\uFF0CLA \u540E\u53F0\u63A8\u9001\u5DF2\u7981\u7528`);
+      return null;
+    }
+    try {
+      await (0, import_promises7.readFile)(cfg.authKeyPath, "utf8");
+    } catch (err) {
+      console.warn(`[Server] \u26A0\uFE0F  \u65E0\u6CD5\u8BFB\u53D6 APNs Auth Key: ${cfg.authKeyPath}`, err);
+      return null;
+    }
+    console.log(`[Server] \u2705 \u5DF2\u52A0\u8F7D APNs \u914D\u7F6E (${path2})`);
+    console.log(`[Server]    teamId=${cfg.teamId} keyId=${cfg.keyId} sandbox=${cfg.sandbox === true}`);
+    return {
+      teamId: cfg.teamId,
+      keyId: cfg.keyId,
+      authKeyPath: cfg.authKeyPath,
+      sandbox: cfg.sandbox === true
+    };
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT") {
+      console.log(`[Server] \u2139\uFE0F  ${path2} \u4E0D\u5B58\u5728\uFF0CLA \u540E\u53F0\u63A8\u9001\u672A\u542F\u7528\uFF08\u524D\u53F0 App \u4ECD\u80FD\u7528\u672C\u5730 Activity.update\uFF09`);
+    } else {
+      console.warn(`[Server] \u26A0\uFE0F  \u8BFB\u53D6 ${path2} \u5931\u8D25:`, err);
+    }
+    return null;
+  }
+}
 async function createWithRetry(label, port, factory) {
   try {
     return await factory();
@@ -6116,6 +6580,7 @@ async function createWithRetry(label, port, factory) {
   }
 }
 async function start(opts = {}) {
+  fixShellPath();
   const configDir = (0, import_node_path9.join)((0, import_node_os9.homedir)(), ".sessix");
   const tokenFile = (0, import_node_path9.join)(configDir, "token");
   let token;
@@ -6164,9 +6629,10 @@ 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);
-  if (opts.activityPush) {
+  const activityPushOpts = opts.activityPush ?? await loadApnsConfigFromFile();
+  if (activityPushOpts) {
     try {
-      const activityChannel = new ActivityPushChannel(opts.activityPush);
+      const activityChannel = new ActivityPushChannel(activityPushOpts);
       notificationService.setActivityPushChannel(activityChannel);
       console.log(`[Server] ${t("server.activityPushEnabled")}`);
     } catch (err) {
@@ -6201,6 +6667,9 @@ async function start(opts = {}) {
   notificationService.setGlobalPendingCountProvider(
     () => approvalProxy.getPendingCount() + sessionManager.getAllPendingQuestions().length + unreadSessionIds.size
   );
+  notificationService.setPendingApprovalsProvider(
+    (sessionId) => approvalProxy.getPendingRequestsForSession(sessionId)
+  );
   let cliCapabilities = null;
   parseCliCapabilities().then((caps) => {
     cliCapabilities = caps;
@@ -6271,7 +6740,7 @@ async function start(opts = {}) {
       wsBridge.send(ws, { type: "unread_sessions", sessionIds: Array.from(unreadSessionIds) });
     }
     if (cliCapabilities) {
-      wsBridge.send(ws, { type: "cli_info", effortLevels: cliCapabilities.effortLevels, version: cliCapabilities.version });
+      wsBridge.send(ws, { type: "cli_info", effortLevels: cliCapabilities.effortLevels, version: cliCapabilities.version, models: cliCapabilities.models });
     }
     if (scheduledManager) {
       wsBridge.send(ws, { type: "scheduled_session_list", tasks: scheduledManager.list() });
@@ -6750,14 +7219,12 @@ async function start(opts = {}) {
     setTimeout(() => {
       if (!approvalProxy.isPending(request.id)) return;
       if (wsBridge.isViewingSession(request.sessionId)) return;
-      if (wsBridge.getConnectionCount() > 0) return;
       const pendingCount = approvalProxy.getPendingRequestsForSession(request.sessionId).length;
       notificationService.notifyApproval(request, pendingCount);
     }, 5e3);
     setTimeout(() => {
       if (!approvalProxy.isPending(request.id)) return;
       if (wsBridge.isViewingSession(request.sessionId)) return;
-      if (wsBridge.getConnectionCount() > 0) return;
       console.log(`[Server] ${t("server.approvalRetry", { id: request.id })}`);
       const pendingCount = approvalProxy.getPendingRequestsForSession(request.sessionId).length;
       notificationService.notifyApproval(request, pendingCount);
@@ -6769,13 +7236,11 @@ async function start(opts = {}) {
     setTimeout(() => {
       if (!sessionManager.isQuestionPending(request.id)) return;
       if (wsBridge.isViewingSession(request.sessionId)) return;
-      if (wsBridge.getConnectionCount() > 0) return;
       notificationService.notifyQuestion(request);
     }, 5e3);
     setTimeout(() => {
       if (!sessionManager.isQuestionPending(request.id)) return;
       if (wsBridge.isViewingSession(request.sessionId)) return;
-      if (wsBridge.getConnectionCount() > 0) return;
       console.log(`[Server] Question ${request.id} not answered in 60s, retrying push`);
       notificationService.notifyQuestion(request);
     }, 6e4);
@@ -6964,7 +7429,7 @@ async function autoUpdateIfNeeded() {
   console.log(`  \u{1F4E6} ${t("startup.autoUpdating", { current: PKG_VERSION, latest })}`);
   console.log();
   try {
-    (0, import_node_child_process12.execFileSync)("npx", [`sessix-server@${latest}`], {
+    (0, import_node_child_process13.execFileSync)("npx", [`sessix-server@${latest}`], {
       stdio: "inherit",
       env: { ...process.env, __SESSIX_UPDATED: "1" }
     });