sessix-server 0.4.7 → 0.4.9

package/dist/index.js

@@ -3830,9 +3830,21 @@ var NotificationService = class {
   removePushToken(token) {
     this.expoChannel?.removeToken(token);
   }
+  /** 注册原生 APNs device token（直连 APNs，优先于 Expo 推送服务） */
+  addNativePushToken(token, ws) {
+    this.activityPushChannel?.addAlertToken(token, ws);
+    if (this.activityPushChannel?.hasAlertTokens()) {
+      console.log("[NotificationService] \u2705 \u76F4\u8FDE APNs alert token \u5DF2\u6CE8\u518C\uFF0CExpo \u63A8\u9001\u6E20\u9053\u964D\u7EA7\u5907\u7528");
+    }
+  }
+  /** 移除原生 APNs device token */
+  removeNativePushToken(token) {
+    this.activityPushChannel?.removeAlertToken(token);
+  }
   /** 更新通知音效偏好 */
   setSoundPreferences(prefs) {
     this.expoChannel?.setSoundPreferences(prefs);
+    this.activityPushChannel?.setAlertSoundPreferences(prefs);
   }
   /** 设置 ActivityKit Push 渠道（可选，需要 APNs 认证配置） */
   setActivityPushChannel(channel) {
@@ -4058,12 +4070,19 @@ var NotificationService = class {
     }
   }
   notify(payload) {
-    for (const { channel, enabled } of this.channelMap.values()) {
+    const hasDirectApns = this.activityPushChannel?.hasAlertTokens() === true;
+    for (const [id, { channel, enabled }] of this.channelMap.entries()) {
       if (!enabled) continue;
+      if (id === "expo" && hasDirectApns) continue;
       channel.send(payload).catch((err) => {
         console.error("[NotificationService] Notification send failed:", err);
       });
     }
+    if (hasDirectApns && this.activityPushChannel) {
+      this.activityPushChannel.send(payload).catch((err) => {
+        console.error("[NotificationService] Direct APNs push failed, no fallback:", err);
+      });
+    }
   }
   /** 从 assistant 事件中提取最新文本消息 */
   trackAssistantText(sessionId, event) {
@@ -4280,6 +4299,7 @@ var NotificationService = class {
    * 无 token → 普通 Expo push。清理所有相关状态。
    */
   flushActivityEnd(sessionId, reason) {
+    console.log(`[NotificationService] \u{1F514} flushActivityEnd(${reason}) session=${sessionId.slice(0, 8)}\u2026 expoAvailable=${this.expoChannel?.isAvailable() ?? false}`);
     const sessionTitle = this.getSessionTitle(sessionId);
     const latestMsg = this.latestAssistantText.get(sessionId);
     const isError = reason === "error";
@@ -4516,7 +4536,13 @@ var ExpoNotificationChannel = class {
     console.log(`[ExpoNotificationChannel] ${t("notification.soundPrefsUpdated")}`);
   }
   async send(payload) {
-    if (this.tokens.size === 0) return;
+    if (this.tokens.size === 0) {
+      const isCompletion = payload.data?.type === "task_complete" || payload.data?.type === "task_error";
+      if (isCompletion) {
+        console.warn("[ExpoNotificationChannel] \u26A0\uFE0F  \u65E0 Expo push token\uFF0C\u5B8C\u6210\u901A\u77E5\u65E0\u6CD5\u63A8\u9001\u3002\u8BF7\u786E\u8BA4\u624B\u673A\u7AEF register_push_token \u5DF2\u53D1\u9001\uFF08\u91CD\u542F App \u53EF\u5F3A\u5236\u91CD\u65B0\u6CE8\u518C\uFF09");
+      }
+      return;
+    }
     const isCompletionNotif = payload.data?.type === "task_complete" || payload.data?.type === "task_error";
     const targetTokens = isCompletionNotif ? Array.from(this.tokens) : Array.from(this.tokens).filter((token) => {
       const ws = this.tokenWsMap.get(token);
@@ -4559,9 +4585,18 @@ var ExpoNotificationChannel = class {
           console.warn(`[ExpoNotificationChannel] ${t("notification.pushApiFormatError")}`, JSON.stringify(body));
           return;
         }
-        for (const ticket of body.data) {
+        for (let i = 0; i < body.data.length; i++) {
+          const ticket = body.data[i];
           if (ticket.status === "error") {
-            console.error(`[ExpoNotificationChannel] ${t("notification.pushFailed")} ${ticket.message} (${ticket.details?.error ?? "unknown"})`);
+            const errorCode = ticket.details?.error ?? "unknown";
+            console.error(`[ExpoNotificationChannel] ${t("notification.pushFailed")} ${ticket.message} (${errorCode})`);
+            if (errorCode === "DeviceNotRegistered" && targetTokens[i]) {
+              const staleToken = targetTokens[i];
+              this.tokens.delete(staleToken);
+              this.tokenWsMap.delete(staleToken);
+              this.soundPreferences.delete(staleToken);
+              console.warn(`[ExpoNotificationChannel] \u26A0\uFE0F  \u5DF2\u79FB\u9664\u5931\u6548 token\uFF08DeviceNotRegistered\uFF09\u3002\u82E5\u901A\u77E5\u672A\u6062\u590D\uFF0C\u8BF7\u91CD\u542F App \u91CD\u65B0\u6CE8\u518C push token\u3002`);
+            }
           }
         }
       }
@@ -4582,6 +4617,14 @@ var APNS_HOSTS = {
 var ActivityPushChannel = class {
   /** sessionId -> activityPushToken */
   tokens = /* @__PURE__ */ new Map();
+  /** 原生 device token 集合（用于普通 alert push，绕过 Expo 推送服务） */
+  alertTokens = /* @__PURE__ */ new Set();
+  /** alert token -> WebSocket 映射（用于前台在线过滤） */
+  alertTokenWsMap = /* @__PURE__ */ new Map();
+  /** alert token 已确认的 APNs 环境（独立于 LA token 的探测结果） */
+  alertTokenEnv = /* @__PURE__ */ new Map();
+  /** per-alert-token 通知音效偏好 */
+  alertSoundPreferences = /* @__PURE__ */ new Map();
   /**
    * 每个 token 已确认工作的 APNs 环境。
    * Debug build (aps-environment=development) 的 token 仅在 sandbox 端有效；
@@ -4600,6 +4643,7 @@ var ActivityPushChannel = class {
   teamId;
   keyId;
   authKey;
+  bundleId;
   /** 缓存的 JWT token + 过期时间 */
   cachedJwt = null;
   /** 每个环境一条 HTTP/2 长连接 */
@@ -4608,6 +4652,7 @@ var ActivityPushChannel = class {
     this.teamId = config.teamId;
     this.keyId = config.keyId;
     this.authKey = fs2.readFileSync(config.authKeyPath, "utf-8");
+    this.bundleId = config.bundleId ?? "com.kachun.sessix";
     this.probeOrder = config.sandbox === false ? ["production", "sandbox"] : ["sandbox", "production"];
     console.log(`[ActivityPushChannel] Initialized (probe order: ${this.probeOrder.join(" \u2192 ")})`);
   }
@@ -4727,6 +4772,103 @@ var ActivityPushChannel = class {
   hasToken(sessionId) {
     return this.tokens.has(sessionId);
   }
+  // ============================================
+  // 普通 Alert Push（直连 APNs，绕过 Expo 推送服务）
+  // ============================================
+  /** 注册原生 APNs device token，用于发送普通 alert 通知 */
+  addAlertToken(token, ws) {
+    this.alertTokens.add(token);
+    if (ws) this.alertTokenWsMap.set(token, ws);
+    console.log(`[ActivityPushChannel] Alert token registered (${this.alertTokens.size} device(s))`);
+  }
+  /** 移除原生 APNs device token */
+  removeAlertToken(token) {
+    this.alertTokens.delete(token);
+    this.alertTokenWsMap.delete(token);
+    this.alertTokenEnv.delete(token);
+    this.alertSoundPreferences.delete(token);
+  }
+  /** 是否有可用的 alert token */
+  hasAlertTokens() {
+    return this.alertTokens.size > 0;
+  }
+  /** 更新 alert token 音效偏好 */
+  setAlertSoundPreferences(prefs) {
+    for (const token of this.alertTokens) {
+      this.alertSoundPreferences.set(token, prefs);
+    }
+  }
+  /**
+   * 发送普通 alert 推送通知（直连 APNs，sandbox/production 自动探测）。
+   * 实现 NotificationChannel.send 接口，可注册到 NotificationService。
+   */
+  async send(payload) {
+    if (this.alertTokens.size === 0) return;
+    const isCompletionNotif = payload.data?.type === "task_complete" || payload.data?.type === "task_error";
+    const targetTokens = isCompletionNotif ? Array.from(this.alertTokens) : Array.from(this.alertTokens).filter((token) => {
+      const ws = this.alertTokenWsMap.get(token);
+      return !ws || ws.readyState !== ws.OPEN;
+    });
+    if (targetTokens.length === 0) return;
+    console.log(`[ActivityPushChannel] Alert push \u2192 ${targetTokens.length}/${this.alertTokens.size} device(s)${isCompletionNotif ? " (forced)" : ""}`);
+    await Promise.all(targetTokens.map(async (deviceToken) => {
+      let sound = payload.sound ?? "default";
+      const prefs = this.alertSoundPreferences.get(deviceToken);
+      if (prefs) {
+        const notifType = payload.data?.type ?? "";
+        if (notifType === "approval_request" && prefs.approval) sound = prefs.approval;
+        else if (notifType === "task_complete" && prefs.taskComplete) sound = prefs.taskComplete;
+        else if (notifType === "task_error" && prefs.taskError) sound = prefs.taskError;
+      }
+      const apnsPayload = {
+        aps: {
+          alert: { title: payload.title, ...payload.subtitle ? { subtitle: payload.subtitle } : {}, body: payload.body },
+          ...payload.badge !== void 0 ? { badge: payload.badge } : {},
+          ...sound && sound !== "none" ? { sound } : {},
+          ...payload.categoryId ? { category: payload.categoryId } : {}
+        },
+        ...payload.data ?? {}
+      };
+      try {
+        await this.sendAlertToAPNs(deviceToken, apnsPayload);
+      } catch (err) {
+        console.warn(`[ActivityPushChannel] Alert push failed for token ${deviceToken.slice(0, 16)}\u2026:`, err instanceof Error ? err.message : err);
+      }
+    }));
+  }
+  /** isAvailable 实现（NotificationChannel 接口） */
+  isAvailable() {
+    return this.alertTokens.size > 0;
+  }
+  /**
+   * 发送 alert 通知到指定 device token，自动探测 sandbox/production。
+   * 使用独立的 alertTokenEnv 映射（与 LA token 环境探测隔离）。
+   */
+  async sendAlertToAPNs(deviceToken, payload) {
+    const known = this.alertTokenEnv.get(deviceToken);
+    if (known) {
+      return this.sendToAPNsOnce(deviceToken, payload, { priority: "10", pushType: "alert", topic: this.bundleId }, known);
+    }
+    const short = deviceToken.slice(0, 16);
+    console.log(`[ActivityPushChannel] \u{1F50D} alert probe start token=${short}\u2026 order=[${this.probeOrder.join(",")}]`);
+    let lastErr = null;
+    for (const env of this.probeOrder) {
+      try {
+        console.log(`[ActivityPushChannel] \u{1F50D} alert probe try ${env} token=${short}\u2026`);
+        await this.sendToAPNsOnce(deviceToken, payload, { priority: "10", pushType: "alert", topic: this.bundleId }, env);
+        this.alertTokenEnv.set(deviceToken, env);
+        console.log(`[ActivityPushChannel] \u2705 alert probe bound to ${env} (token=${short}\u2026)`);
+        return;
+      } catch (err) {
+        lastErr = err;
+        const reason = err instanceof ApnsError ? JSON.parse(err.responseBody || "{}")?.reason ?? err.statusCode : String(err);
+        console.log(`[ActivityPushChannel] \u{1F50D} alert probe ${env} failed: ${reason}`);
+        if (isProviderTokenError(err)) throw err;
+        if (!isBadDeviceTokenError(err)) throw err;
+      }
+    }
+    throw lastErr ?? new Error("APNs alert send failed: all environments rejected token");
+  }
   /**
    * 发送 APNs，自动处理环境探测。
    * 对每个 token：先用已确认的环境（如有）；否则按 probeOrder 顺序探测，
@@ -4755,6 +4897,12 @@ var ActivityPushChannel = class {
         lastErr = err;
         const reason = err instanceof ApnsError ? JSON.parse(err.responseBody || "{}")?.reason ?? err.statusCode : String(err);
         console.log(`[ActivityPushChannel] \u{1F50D} probe ${env} failed: ${reason}`);
+        if (isProviderTokenError(err)) {
+          console.error(
+            `[ActivityPushChannel] \u274C APNs Auth Key \u5DF2\u5931\u6548\uFF08${reason}\uFF09\u3002\u8BF7\u5230 Apple Developer \u4E0B\u8F7D\u65B0\u7684 .p8 \u6587\u4EF6\uFF0C\u5E76\u66F4\u65B0 ~/.sessix/apns.json \u4E2D\u7684 keyId \u548C authKeyPath\uFF0C\u7136\u540E\u91CD\u542F\u670D\u52A1\u7AEF\u3002`
+          );
+          throw err;
+        }
         if (!isBadDeviceTokenError(err)) {
           throw err;
         }
@@ -4772,7 +4920,8 @@ var ActivityPushChannel = class {
   }
   /** 单次 APNs HTTP/2 请求（内部 helper，不做探测） */
   async sendToAPNsOnce(deviceToken, payload, opts, env) {
-    const topic = "com.kachun.sessix.push-type.liveactivity";
+    const topic = opts.topic ?? `${this.bundleId}.push-type.liveactivity`;
+    const pushType = opts.pushType ?? "liveactivity";
     const jwt = this.getJWT();
     const payloadStr = JSON.stringify(payload);
     const priority = opts.priority ?? "10";
@@ -4788,7 +4937,7 @@ var ActivityPushChannel = class {
         ":path": `/3/device/${deviceToken}`,
         "authorization": `bearer ${jwt}`,
         "apns-topic": topic,
-        "apns-push-type": "liveactivity",
+        "apns-push-type": pushType,
         "apns-priority": priority,
         "apns-expiration": String(Math.floor(Date.now() / 1e3) + 300),
         "content-type": "application/json",
@@ -4856,6 +5005,16 @@ var ApnsError = class extends Error {
     this.name = "ApnsError";
   }
 };
+function isProviderTokenError(err) {
+  if (!(err instanceof ApnsError)) return false;
+  if (err.statusCode !== 403) return false;
+  try {
+    const parsed = JSON.parse(err.responseBody);
+    return parsed.reason === "InvalidProviderToken" || parsed.reason === "ExpiredProviderToken";
+  } catch {
+    return false;
+  }
+}
 function isBadDeviceTokenError(err) {
   if (!(err instanceof ApnsError)) return false;
   if (err.statusCode !== 400 && err.statusCode !== 403 && err.statusCode !== 410) return false;
@@ -6703,6 +6862,7 @@ function isValidTask(value) {
 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" }
 ];
@@ -7231,6 +7391,14 @@ async function start(opts = {}) {
           notificationService.removePushToken(event.token);
           break;
         }
+        case "register_native_push_token": {
+          notificationService.addNativePushToken(event.token, ws);
+          break;
+        }
+        case "unregister_native_push_token": {
+          notificationService.removeNativePushToken(event.token);
+          break;
+        }
         case "update_notification_sounds": {
           notificationService.setSoundPreferences(event.preferences);
           break;

package/dist/server.js

@@ -3835,9 +3835,21 @@ var NotificationService = class {
   removePushToken(token) {
     this.expoChannel?.removeToken(token);
   }
+  /** 注册原生 APNs device token（直连 APNs，优先于 Expo 推送服务） */
+  addNativePushToken(token, ws) {
+    this.activityPushChannel?.addAlertToken(token, ws);
+    if (this.activityPushChannel?.hasAlertTokens()) {
+      console.log("[NotificationService] \u2705 \u76F4\u8FDE APNs alert token \u5DF2\u6CE8\u518C\uFF0CExpo \u63A8\u9001\u6E20\u9053\u964D\u7EA7\u5907\u7528");
+    }
+  }
+  /** 移除原生 APNs device token */
+  removeNativePushToken(token) {
+    this.activityPushChannel?.removeAlertToken(token);
+  }
   /** 更新通知音效偏好 */
   setSoundPreferences(prefs) {
     this.expoChannel?.setSoundPreferences(prefs);
+    this.activityPushChannel?.setAlertSoundPreferences(prefs);
   }
   /** 设置 ActivityKit Push 渠道（可选，需要 APNs 认证配置） */
   setActivityPushChannel(channel) {
@@ -4063,12 +4075,19 @@ var NotificationService = class {
     }
   }
   notify(payload) {
-    for (const { channel, enabled } of this.channelMap.values()) {
+    const hasDirectApns = this.activityPushChannel?.hasAlertTokens() === true;
+    for (const [id, { channel, enabled }] of this.channelMap.entries()) {
       if (!enabled) continue;
+      if (id === "expo" && hasDirectApns) continue;
       channel.send(payload).catch((err) => {
         console.error("[NotificationService] Notification send failed:", err);
       });
     }
+    if (hasDirectApns && this.activityPushChannel) {
+      this.activityPushChannel.send(payload).catch((err) => {
+        console.error("[NotificationService] Direct APNs push failed, no fallback:", err);
+      });
+    }
   }
   /** 从 assistant 事件中提取最新文本消息 */
   trackAssistantText(sessionId, event) {
@@ -4285,6 +4304,7 @@ var NotificationService = class {
    * 无 token → 普通 Expo push。清理所有相关状态。
    */
   flushActivityEnd(sessionId, reason) {
+    console.log(`[NotificationService] \u{1F514} flushActivityEnd(${reason}) session=${sessionId.slice(0, 8)}\u2026 expoAvailable=${this.expoChannel?.isAvailable() ?? false}`);
     const sessionTitle = this.getSessionTitle(sessionId);
     const latestMsg = this.latestAssistantText.get(sessionId);
     const isError = reason === "error";
@@ -4521,7 +4541,13 @@ var ExpoNotificationChannel = class {
     console.log(`[ExpoNotificationChannel] ${t("notification.soundPrefsUpdated")}`);
   }
   async send(payload) {
-    if (this.tokens.size === 0) return;
+    if (this.tokens.size === 0) {
+      const isCompletion = payload.data?.type === "task_complete" || payload.data?.type === "task_error";
+      if (isCompletion) {
+        console.warn("[ExpoNotificationChannel] \u26A0\uFE0F  \u65E0 Expo push token\uFF0C\u5B8C\u6210\u901A\u77E5\u65E0\u6CD5\u63A8\u9001\u3002\u8BF7\u786E\u8BA4\u624B\u673A\u7AEF register_push_token \u5DF2\u53D1\u9001\uFF08\u91CD\u542F App \u53EF\u5F3A\u5236\u91CD\u65B0\u6CE8\u518C\uFF09");
+      }
+      return;
+    }
     const isCompletionNotif = payload.data?.type === "task_complete" || payload.data?.type === "task_error";
     const targetTokens = isCompletionNotif ? Array.from(this.tokens) : Array.from(this.tokens).filter((token) => {
       const ws = this.tokenWsMap.get(token);
@@ -4564,9 +4590,18 @@ var ExpoNotificationChannel = class {
           console.warn(`[ExpoNotificationChannel] ${t("notification.pushApiFormatError")}`, JSON.stringify(body));
           return;
         }
-        for (const ticket of body.data) {
+        for (let i = 0; i < body.data.length; i++) {
+          const ticket = body.data[i];
           if (ticket.status === "error") {
-            console.error(`[ExpoNotificationChannel] ${t("notification.pushFailed")} ${ticket.message} (${ticket.details?.error ?? "unknown"})`);
+            const errorCode = ticket.details?.error ?? "unknown";
+            console.error(`[ExpoNotificationChannel] ${t("notification.pushFailed")} ${ticket.message} (${errorCode})`);
+            if (errorCode === "DeviceNotRegistered" && targetTokens[i]) {
+              const staleToken = targetTokens[i];
+              this.tokens.delete(staleToken);
+              this.tokenWsMap.delete(staleToken);
+              this.soundPreferences.delete(staleToken);
+              console.warn(`[ExpoNotificationChannel] \u26A0\uFE0F  \u5DF2\u79FB\u9664\u5931\u6548 token\uFF08DeviceNotRegistered\uFF09\u3002\u82E5\u901A\u77E5\u672A\u6062\u590D\uFF0C\u8BF7\u91CD\u542F App \u91CD\u65B0\u6CE8\u518C push token\u3002`);
+            }
           }
         }
       }
@@ -4587,6 +4622,14 @@ var APNS_HOSTS = {
 var ActivityPushChannel = class {
   /** sessionId -> activityPushToken */
   tokens = /* @__PURE__ */ new Map();
+  /** 原生 device token 集合（用于普通 alert push，绕过 Expo 推送服务） */
+  alertTokens = /* @__PURE__ */ new Set();
+  /** alert token -> WebSocket 映射（用于前台在线过滤） */
+  alertTokenWsMap = /* @__PURE__ */ new Map();
+  /** alert token 已确认的 APNs 环境（独立于 LA token 的探测结果） */
+  alertTokenEnv = /* @__PURE__ */ new Map();
+  /** per-alert-token 通知音效偏好 */
+  alertSoundPreferences = /* @__PURE__ */ new Map();
   /**
    * 每个 token 已确认工作的 APNs 环境。
    * Debug build (aps-environment=development) 的 token 仅在 sandbox 端有效；
@@ -4605,6 +4648,7 @@ var ActivityPushChannel = class {
   teamId;
   keyId;
   authKey;
+  bundleId;
   /** 缓存的 JWT token + 过期时间 */
   cachedJwt = null;
   /** 每个环境一条 HTTP/2 长连接 */
@@ -4613,6 +4657,7 @@ var ActivityPushChannel = class {
     this.teamId = config.teamId;
     this.keyId = config.keyId;
     this.authKey = fs2.readFileSync(config.authKeyPath, "utf-8");
+    this.bundleId = config.bundleId ?? "com.kachun.sessix";
     this.probeOrder = config.sandbox === false ? ["production", "sandbox"] : ["sandbox", "production"];
     console.log(`[ActivityPushChannel] Initialized (probe order: ${this.probeOrder.join(" \u2192 ")})`);
   }
@@ -4732,6 +4777,103 @@ var ActivityPushChannel = class {
   hasToken(sessionId) {
     return this.tokens.has(sessionId);
   }
+  // ============================================
+  // 普通 Alert Push（直连 APNs，绕过 Expo 推送服务）
+  // ============================================
+  /** 注册原生 APNs device token，用于发送普通 alert 通知 */
+  addAlertToken(token, ws) {
+    this.alertTokens.add(token);
+    if (ws) this.alertTokenWsMap.set(token, ws);
+    console.log(`[ActivityPushChannel] Alert token registered (${this.alertTokens.size} device(s))`);
+  }
+  /** 移除原生 APNs device token */
+  removeAlertToken(token) {
+    this.alertTokens.delete(token);
+    this.alertTokenWsMap.delete(token);
+    this.alertTokenEnv.delete(token);
+    this.alertSoundPreferences.delete(token);
+  }
+  /** 是否有可用的 alert token */
+  hasAlertTokens() {
+    return this.alertTokens.size > 0;
+  }
+  /** 更新 alert token 音效偏好 */
+  setAlertSoundPreferences(prefs) {
+    for (const token of this.alertTokens) {
+      this.alertSoundPreferences.set(token, prefs);
+    }
+  }
+  /**
+   * 发送普通 alert 推送通知（直连 APNs，sandbox/production 自动探测）。
+   * 实现 NotificationChannel.send 接口，可注册到 NotificationService。
+   */
+  async send(payload) {
+    if (this.alertTokens.size === 0) return;
+    const isCompletionNotif = payload.data?.type === "task_complete" || payload.data?.type === "task_error";
+    const targetTokens = isCompletionNotif ? Array.from(this.alertTokens) : Array.from(this.alertTokens).filter((token) => {
+      const ws = this.alertTokenWsMap.get(token);
+      return !ws || ws.readyState !== ws.OPEN;
+    });
+    if (targetTokens.length === 0) return;
+    console.log(`[ActivityPushChannel] Alert push \u2192 ${targetTokens.length}/${this.alertTokens.size} device(s)${isCompletionNotif ? " (forced)" : ""}`);
+    await Promise.all(targetTokens.map(async (deviceToken) => {
+      let sound = payload.sound ?? "default";
+      const prefs = this.alertSoundPreferences.get(deviceToken);
+      if (prefs) {
+        const notifType = payload.data?.type ?? "";
+        if (notifType === "approval_request" && prefs.approval) sound = prefs.approval;
+        else if (notifType === "task_complete" && prefs.taskComplete) sound = prefs.taskComplete;
+        else if (notifType === "task_error" && prefs.taskError) sound = prefs.taskError;
+      }
+      const apnsPayload = {
+        aps: {
+          alert: { title: payload.title, ...payload.subtitle ? { subtitle: payload.subtitle } : {}, body: payload.body },
+          ...payload.badge !== void 0 ? { badge: payload.badge } : {},
+          ...sound && sound !== "none" ? { sound } : {},
+          ...payload.categoryId ? { category: payload.categoryId } : {}
+        },
+        ...payload.data ?? {}
+      };
+      try {
+        await this.sendAlertToAPNs(deviceToken, apnsPayload);
+      } catch (err) {
+        console.warn(`[ActivityPushChannel] Alert push failed for token ${deviceToken.slice(0, 16)}\u2026:`, err instanceof Error ? err.message : err);
+      }
+    }));
+  }
+  /** isAvailable 实现（NotificationChannel 接口） */
+  isAvailable() {
+    return this.alertTokens.size > 0;
+  }
+  /**
+   * 发送 alert 通知到指定 device token，自动探测 sandbox/production。
+   * 使用独立的 alertTokenEnv 映射（与 LA token 环境探测隔离）。
+   */
+  async sendAlertToAPNs(deviceToken, payload) {
+    const known = this.alertTokenEnv.get(deviceToken);
+    if (known) {
+      return this.sendToAPNsOnce(deviceToken, payload, { priority: "10", pushType: "alert", topic: this.bundleId }, known);
+    }
+    const short = deviceToken.slice(0, 16);
+    console.log(`[ActivityPushChannel] \u{1F50D} alert probe start token=${short}\u2026 order=[${this.probeOrder.join(",")}]`);
+    let lastErr = null;
+    for (const env of this.probeOrder) {
+      try {
+        console.log(`[ActivityPushChannel] \u{1F50D} alert probe try ${env} token=${short}\u2026`);
+        await this.sendToAPNsOnce(deviceToken, payload, { priority: "10", pushType: "alert", topic: this.bundleId }, env);
+        this.alertTokenEnv.set(deviceToken, env);
+        console.log(`[ActivityPushChannel] \u2705 alert probe bound to ${env} (token=${short}\u2026)`);
+        return;
+      } catch (err) {
+        lastErr = err;
+        const reason = err instanceof ApnsError ? JSON.parse(err.responseBody || "{}")?.reason ?? err.statusCode : String(err);
+        console.log(`[ActivityPushChannel] \u{1F50D} alert probe ${env} failed: ${reason}`);
+        if (isProviderTokenError(err)) throw err;
+        if (!isBadDeviceTokenError(err)) throw err;
+      }
+    }
+    throw lastErr ?? new Error("APNs alert send failed: all environments rejected token");
+  }
   /**
    * 发送 APNs，自动处理环境探测。
    * 对每个 token：先用已确认的环境（如有）；否则按 probeOrder 顺序探测，
@@ -4760,6 +4902,12 @@ var ActivityPushChannel = class {
         lastErr = err;
         const reason = err instanceof ApnsError ? JSON.parse(err.responseBody || "{}")?.reason ?? err.statusCode : String(err);
         console.log(`[ActivityPushChannel] \u{1F50D} probe ${env} failed: ${reason}`);
+        if (isProviderTokenError(err)) {
+          console.error(
+            `[ActivityPushChannel] \u274C APNs Auth Key \u5DF2\u5931\u6548\uFF08${reason}\uFF09\u3002\u8BF7\u5230 Apple Developer \u4E0B\u8F7D\u65B0\u7684 .p8 \u6587\u4EF6\uFF0C\u5E76\u66F4\u65B0 ~/.sessix/apns.json \u4E2D\u7684 keyId \u548C authKeyPath\uFF0C\u7136\u540E\u91CD\u542F\u670D\u52A1\u7AEF\u3002`
+          );
+          throw err;
+        }
         if (!isBadDeviceTokenError(err)) {
           throw err;
         }
@@ -4777,7 +4925,8 @@ var ActivityPushChannel = class {
   }
   /** 单次 APNs HTTP/2 请求（内部 helper，不做探测） */
   async sendToAPNsOnce(deviceToken, payload, opts, env) {
-    const topic = "com.kachun.sessix.push-type.liveactivity";
+    const topic = opts.topic ?? `${this.bundleId}.push-type.liveactivity`;
+    const pushType = opts.pushType ?? "liveactivity";
     const jwt = this.getJWT();
     const payloadStr = JSON.stringify(payload);
     const priority = opts.priority ?? "10";
@@ -4793,7 +4942,7 @@ var ActivityPushChannel = class {
         ":path": `/3/device/${deviceToken}`,
         "authorization": `bearer ${jwt}`,
         "apns-topic": topic,
-        "apns-push-type": "liveactivity",
+        "apns-push-type": pushType,
         "apns-priority": priority,
         "apns-expiration": String(Math.floor(Date.now() / 1e3) + 300),
         "content-type": "application/json",
@@ -4861,6 +5010,16 @@ var ApnsError = class extends Error {
     this.name = "ApnsError";
   }
 };
+function isProviderTokenError(err) {
+  if (!(err instanceof ApnsError)) return false;
+  if (err.statusCode !== 403) return false;
+  try {
+    const parsed = JSON.parse(err.responseBody);
+    return parsed.reason === "InvalidProviderToken" || parsed.reason === "ExpiredProviderToken";
+  } catch {
+    return false;
+  }
+}
 function isBadDeviceTokenError(err) {
   if (!(err instanceof ApnsError)) return false;
   if (err.statusCode !== 400 && err.statusCode !== 403 && err.statusCode !== 410) return false;
@@ -6708,6 +6867,7 @@ function isValidTask(value) {
 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" }
 ];
@@ -7236,6 +7396,14 @@ async function start(opts = {}) {
           notificationService.removePushToken(event.token);
           break;
         }
+        case "register_native_push_token": {
+          notificationService.addNativePushToken(event.token, ws);
+          break;
+        }
+        case "unregister_native_push_token": {
+          notificationService.removeNativePushToken(event.token);
+          break;
+        }
         case "update_notification_sounds": {
           notificationService.setSoundPreferences(event.preferences);
           break;

package/package.json

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