sessix-server 0.5.3 → 0.5.6

package/dist/index.js

@@ -24,9 +24,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
-var import_node_os10 = require("os");
-var import_node_fs4 = require("fs");
-var import_node_path10 = require("path");
+var import_node_os12 = require("os");
+var import_node_fs6 = require("fs");
+var import_node_path12 = require("path");
 var import_node_child_process13 = require("child_process");
 
 // src/i18n/locales/zh.ts
@@ -304,8 +304,8 @@ function t(key, params) {
 // src/server.ts
 var import_uuid8 = require("uuid");
 var import_promises7 = require("fs/promises");
-var import_node_os9 = require("os");
-var import_node_path9 = require("path");
+var import_node_os11 = require("os");
+var import_node_path11 = require("path");
 var import_node_child_process12 = require("child_process");
 var import_node_util3 = require("util");
 var import_node_v8 = require("v8");
@@ -446,6 +446,21 @@ var import_promises = require("fs/promises");
 var import_readline = require("readline");
 var import_path = require("path");
 var import_os = require("os");
+
+// src/utils/modelValidation.ts
+function isUsableModel(model) {
+  if (typeof model !== "string") return false;
+  const trimmed = model.trim();
+  if (!trimmed) return false;
+  if (trimmed === "unknown") return false;
+  if (trimmed.startsWith("<")) return false;
+  return true;
+}
+function sanitizeModel(model) {
+  return isUsableModel(model) ? model.trim() : void 0;
+}
+
+// src/session/ProjectReader.ts
 var CLAUDE_PROJECTS_DIR = (0, import_path.join)((0, import_os.homedir)(), ".claude", "projects");
 function getSessionFilePath(projectPath, sessionId) {
   return (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodeDirName(projectPath), `${sessionId}.jsonl`);
@@ -466,7 +481,7 @@ async function getSessionModel(projectPath, sessionId) {
         const obj = JSON.parse(line);
         if (obj.type !== "assistant" || !obj.message) continue;
         const model = obj.message.model;
-        if (typeof model === "string" && model && model !== "unknown") {
+        if (isUsableModel(model)) {
           lastModel = model;
         }
       } catch {
@@ -1084,17 +1099,22 @@ var ProcessProvider = class {
     } else {
       args.push("--session-id", sessionId);
     }
-    if (model) {
-      args.push("--model", model);
+    const safeModel = sanitizeModel(model);
+    if (model && !safeModel) {
+      console.warn(`[ProcessProvider] Session ${sessionId}: ignoring invalid model "${model}", falling back to CLI default`);
+    }
+    if (safeModel) {
+      args.push("--model", safeModel);
     }
+    const safeFallbackModel = sanitizeModel(fallbackModel);
     if (permissionMode && permissionMode !== "default") {
       args.push("--permission-mode", permissionMode);
     }
     if (effort) {
       args.push("--effort", effort);
     }
-    if (fallbackModel) {
-      args.push("--fallback-model", fallbackModel);
+    if (safeFallbackModel) {
+      args.push("--fallback-model", safeFallbackModel);
     }
     if (maxBudgetUsd != null) {
       args.push("--max-budget-usd", String(maxBudgetUsd));
@@ -5128,6 +5148,36 @@ var DesktopNotificationChannel = class {
   }
 };
 
+// src/notification/pushTokenStore.ts
+var import_node_fs4 = require("fs");
+var import_node_os7 = require("os");
+var import_node_path6 = require("path");
+var DEFAULT_PUSH_TOKENS_FILE = (0, import_node_path6.join)((0, import_node_os7.homedir)(), ".sessix", "push-tokens.json");
+function loadPushTokens(filePath = DEFAULT_PUSH_TOKENS_FILE) {
+  try {
+    const parsed = JSON.parse((0, import_node_fs4.readFileSync)(filePath, "utf-8"));
+    if (!Array.isArray(parsed)) return [];
+    return parsed.filter((t2) => typeof t2 === "string");
+  } catch {
+    return [];
+  }
+}
+function savePushTokens(tokens, filePath = DEFAULT_PUSH_TOKENS_FILE) {
+  const deduped = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const t2 of tokens) {
+    if (typeof t2 !== "string" || seen.has(t2)) continue;
+    seen.add(t2);
+    deduped.push(t2);
+  }
+  try {
+    (0, import_node_fs4.mkdirSync)((0, import_node_path6.dirname)(filePath), { recursive: true });
+    (0, import_node_fs4.writeFileSync)(filePath, JSON.stringify(deduped, null, 2), "utf-8");
+  } catch (err) {
+    console.warn("[pushTokenStore] \u5199\u5165 push token \u5931\u8D25:", err);
+  }
+}
+
 // src/notification/ExpoNotificationChannel.ts
 var EXPO_PUSH_API = "https://exp.host/--/api/v2/push/send";
 var EXPO_RECEIPT_API = "https://exp.host/--/api/v2/push/getReceipts";
@@ -5138,18 +5188,35 @@ var ExpoNotificationChannel = class {
   tokenWsMap = /* @__PURE__ */ new Map();
   /** per-token 通知音效偏好 */
   soundPreferences = /* @__PURE__ */ new Map();
+  /** push token 持久化文件路径 */
+  pushTokensFile;
+  constructor(opts = {}) {
+    this.pushTokensFile = opts.pushTokensFile ?? DEFAULT_PUSH_TOKENS_FILE;
+    for (const token of loadPushTokens(this.pushTokensFile)) {
+      this.tokens.add(token);
+    }
+    if (this.tokens.size > 0) {
+      console.log(`[ExpoNotificationChannel] \u4ECE\u78C1\u76D8\u91CD\u8F7D ${this.tokens.size} \u4E2A push token`);
+    }
+  }
+  /** 把当前 token 集合落盘，供进程重启后重载。 */
+  persist() {
+    savePushTokens(Array.from(this.tokens), this.pushTokensFile);
+  }
   isAvailable() {
     return this.tokens.size > 0;
   }
   addToken(token, ws) {
     this.tokens.add(token);
     if (ws) this.tokenWsMap.set(token, ws);
+    this.persist();
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRegistered", { count: this.tokens.size })}`);
   }
   removeToken(token) {
     this.tokens.delete(token);
     this.tokenWsMap.delete(token);
     this.soundPreferences.delete(token);
+    this.persist();
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRemoved", { count: this.tokens.size })}`);
   }
   /** 更新某个 token 的音效偏好 */
@@ -5221,6 +5288,7 @@ var ExpoNotificationChannel = class {
               this.tokens.delete(staleToken);
               this.tokenWsMap.delete(staleToken);
               this.soundPreferences.delete(staleToken);
+              this.persist();
               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`);
             }
           } else if (ticket.status === "ok" && typeof ticket.id === "string" && targetTokens[i]) {
@@ -5267,6 +5335,7 @@ var ExpoNotificationChannel = class {
             this.tokens.delete(token);
             this.tokenWsMap.delete(token);
             this.soundPreferences.delete(token);
+            this.persist();
             console.warn("[ExpoNotificationChannel] \u26A0\uFE0F  \u5DF2\u79FB\u9664\u5931\u6548 token\uFF08receipt DeviceNotRegistered\uFF09\u3002\u91CD\u542F App \u53EF\u91CD\u65B0\u6CE8\u518C\u3002");
           } else if (errorCode === "InvalidCredentials" || errorCode === "MismatchSenderId") {
             console.error(
@@ -5766,6 +5835,9 @@ var PairingManager = class {
 
 // src/utils/shellPath.ts
 var import_node_child_process7 = require("child_process");
+var import_node_fs5 = require("fs");
+var import_node_path7 = require("path");
+var import_node_os8 = require("os");
 var fixed = false;
 function fixShellPath() {
   if (fixed || isWindows) {
@@ -5773,23 +5845,62 @@ function fixShellPath() {
     return;
   }
   fixed = true;
+  const fromShell = readLoginShellPath();
+  if (fromShell) {
+    process.env.PATH = mergePath(fromShell, process.env.PATH || "");
+  }
+  const stableNodeDir = resolveStableNodeDir();
+  if (stableNodeDir) {
+    process.env.PATH = mergePath(stableNodeDir, process.env.PATH || "");
+  }
+}
+function readLoginShellPath() {
   const shell = process.env.SHELL || "/bin/zsh";
   const isFish = /\/fish$/.test(shell);
   const printPathCmd = isFish ? "string join : $PATH" : 'printf "%s" "$PATH"';
-  let raw;
+  for (const flags of [["-i", "-l", "-c"], ["-l", "-c"]]) {
+    try {
+      const raw = (0, import_node_child_process7.execFileSync)(shell, [...flags, printPathCmd], {
+        encoding: "utf8",
+        timeout: 4e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      }).trim();
+      if (raw) return raw;
+    } catch {
+    }
+  }
+  return null;
+}
+function resolveStableNodeDir() {
+  const exe = isWindows ? "node.exe" : "node";
+  for (const dir of (process.env.PATH || "").split(":")) {
+    if (!dir) continue;
+    try {
+      const p = (0, import_node_path7.join)(dir, exe);
+      (0, import_node_fs5.accessSync)(p, import_node_fs5.constants.X_OK);
+      return (0, import_node_path7.dirname)((0, import_node_fs5.realpathSync)(p));
+    } catch {
+    }
+  }
+  return scanFnmNodeDir();
+}
+function scanFnmNodeDir() {
+  const base = (0, import_node_path7.join)((0, import_node_os8.homedir)(), ".fnm", "node-versions");
   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 versions = (0, import_node_fs5.readdirSync)(base).filter((v) => /^v?\d+\./.test(v)).sort(
+      (a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })
+    );
+    for (const v of versions) {
+      const dir = (0, import_node_path7.join)(base, v, "installation", "bin");
+      try {
+        (0, import_node_fs5.accessSync)((0, import_node_path7.join)(dir, "node"), import_node_fs5.constants.X_OK);
+        return dir;
+      } catch {
+      }
+    }
+  } catch {
   }
-  const fromShell = raw.trim();
-  if (!fromShell) return;
-  process.env.PATH = mergePath(fromShell, process.env.PATH || "");
+  return null;
 }
 function mergePath(primary, secondary) {
   const seen = /* @__PURE__ */ new Set();
@@ -6023,13 +6134,13 @@ var TerminalExecutor = class {
 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_node_path8 = require("path");
+var import_node_os9 = require("os");
 var import_uuid5 = require("uuid");
 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");
+var CONFIG_FILE = (0, import_node_path8.join)((0, import_node_os9.homedir)(), ".sessix", "xcode-config.json");
 var SKIP_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -6082,7 +6193,7 @@ var XcodeBuildExecutor = class {
     return this.configCache;
   }
   async writeConfigs(store) {
-    await (0, import_promises4.mkdir)((0, import_node_path6.join)((0, import_node_os7.homedir)(), ".sessix"), { recursive: true });
+    await (0, import_promises4.mkdir)((0, import_node_path8.join)((0, import_node_os9.homedir)(), ".sessix"), { recursive: true });
     await (0, import_promises4.writeFile)(CONFIG_FILE, JSON.stringify(store, null, 2), "utf8");
     this.configCache = store;
   }
@@ -6135,7 +6246,7 @@ var XcodeBuildExecutor = class {
       if (SKIP_DIRS.has(name)) continue;
       if (name.startsWith(".")) continue;
       if (name.endsWith(".xcodeproj") || name.endsWith(".xcworkspace")) continue;
-      const childPath = (0, import_node_path6.join)(currentPath, name);
+      const childPath = (0, import_node_path8.join)(currentPath, name);
       await this.scanDir(rootPath, childPath, depth + 1, results);
     }
   }
@@ -6362,7 +6473,7 @@ ${e.stderr ?? ""}`);
     if (!builtDir || !productName) {
       throw new Error("\u65E0\u6CD5\u4ECE -showBuildSettings \u4E2D\u8BFB\u53D6 BUILT_PRODUCTS_DIR / FULL_PRODUCT_NAME");
     }
-    return (0, import_node_path6.join)(builtDir, productName);
+    return (0, import_node_path8.join)(builtDir, productName);
   }
   // ============================================
   // 清理
@@ -6434,7 +6545,7 @@ function kindOrder(k) {
 
 // src/commands/CommandDiscovery.ts
 var import_promises5 = require("fs/promises");
-var import_node_path7 = require("path");
+var import_node_path9 = require("path");
 var import_node_crypto = require("crypto");
 var CACHE_TTL_MS = 5 * 60 * 1e3;
 var MAX_README_BYTES = 256 * 1024;
@@ -6458,7 +6569,7 @@ var CommandDiscovery = class {
       this.scanReadme(projectPath, "CLAUDE.md", "claude.md", collector)
     ]);
     for (const sub of SUBPACKAGE_DIRS) {
-      const subRoot = (0, import_node_path7.join)(projectPath, sub);
+      const subRoot = (0, import_node_path9.join)(projectPath, sub);
       let entries;
       try {
         entries = await (0, import_promises5.readdir)(subRoot);
@@ -6468,7 +6579,7 @@ var CommandDiscovery = class {
       let scanned = 0;
       for (const name of entries) {
         if (name.startsWith(".") || scanned >= MAX_SCAN_PER_DIR) continue;
-        const childAbs = (0, import_node_path7.join)(subRoot, name);
+        const childAbs = (0, import_node_path9.join)(subRoot, name);
         try {
           const s = await (0, import_promises5.stat)(childAbs);
           if (!s.isDirectory()) continue;
@@ -6509,7 +6620,7 @@ var CommandDiscovery = class {
   // ============================================
   async scanPackageJson(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/package.json` : "package.json";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     let raw;
     try {
       raw = await (0, import_promises5.readFile)(abs, "utf8");
@@ -6540,7 +6651,7 @@ var CommandDiscovery = class {
   }
   async scanMakefile(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/Makefile` : "Makefile";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     let raw;
     try {
       raw = await (0, import_promises5.readFile)(abs, "utf8");
@@ -6581,7 +6692,7 @@ var CommandDiscovery = class {
   }
   async scanJustfile(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/justfile` : "justfile";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     let raw;
     try {
       raw = await (0, import_promises5.readFile)(abs, "utf8");
@@ -6622,7 +6733,7 @@ var CommandDiscovery = class {
   }
   async scanCargo(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/Cargo.toml` : "Cargo.toml";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     try {
       await (0, import_promises5.stat)(abs);
     } catch {
@@ -6653,7 +6764,7 @@ var CommandDiscovery = class {
     for (const name of ["docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"]) {
       const file = subDir ? `${subDir}/${name}` : name;
       try {
-        await (0, import_promises5.stat)((0, import_node_path7.join)(rootPath, file));
+        await (0, import_promises5.stat)((0, import_node_path9.join)(rootPath, file));
       } catch {
         continue;
       }
@@ -6679,7 +6790,7 @@ var CommandDiscovery = class {
     }
   }
   async scanReadme(rootPath, fileName, source, out) {
-    const abs = (0, import_node_path7.join)(rootPath, fileName);
+    const abs = (0, import_node_path9.join)(rootPath, fileName);
     let raw;
     try {
       const s = await (0, import_promises5.stat)(abs);
@@ -7059,8 +7170,8 @@ var GitExecutor = class {
 
 // src/scheduling/ScheduledSessionManager.ts
 var import_promises6 = require("fs/promises");
-var import_node_os8 = require("os");
-var import_node_path8 = require("path");
+var import_node_os10 = require("os");
+var import_node_path10 = require("path");
 var import_uuid7 = require("uuid");
 var MAX_TIMEOUT_MS = 2147483647;
 var ScheduledSessionManager = class {
@@ -7071,7 +7182,7 @@ var ScheduledSessionManager = class {
   onFired;
   persistTimer = null;
   constructor(opts) {
-    this.storeFile = opts.storeFile ?? (0, import_node_path8.join)((0, import_node_os8.homedir)(), ".sessix", "scheduled-sessions.json");
+    this.storeFile = opts.storeFile ?? (0, import_node_path10.join)((0, import_node_os10.homedir)(), ".sessix", "scheduled-sessions.json");
     this.onFire = opts.onFire;
     this.onChange = opts.onChange;
     this.onFired = opts.onFired;
@@ -7176,7 +7287,7 @@ var ScheduledSessionManager = class {
     this.persistTimer = setTimeout(() => {
       this.persistTimer = null;
       const tasks = [...this.tasks.values()].map((e) => e.task);
-      (0, import_promises6.mkdir)((0, import_node_path8.join)(this.storeFile, ".."), { recursive: true }).then(() => (0, import_promises6.writeFile)(this.storeFile, JSON.stringify(tasks, null, 2), "utf8")).catch((err) => {
+      (0, import_promises6.mkdir)((0, import_node_path10.join)(this.storeFile, ".."), { recursive: true }).then(() => (0, import_promises6.writeFile)(this.storeFile, JSON.stringify(tasks, null, 2), "utf8")).catch((err) => {
         console.error("[ScheduledSessionManager] persist error:", err);
       });
     }, 500);
@@ -7280,7 +7391,7 @@ async function killPortProcess(port) {
   }
 }
 async function loadApnsConfigFromFile() {
-  const path2 = (0, import_node_path9.join)((0, import_node_os9.homedir)(), ".sessix", "apns.json");
+  const path2 = (0, import_node_path11.join)((0, import_node_os11.homedir)(), ".sessix", "apns.json");
   try {
     const raw = await (0, import_promises7.readFile)(path2, "utf8");
     const cfg = JSON.parse(raw);
@@ -7327,8 +7438,8 @@ 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");
+  const configDir = (0, import_node_path11.join)((0, import_node_os11.homedir)(), ".sessix");
+  const tokenFile = (0, import_node_path11.join)(configDir, "token");
   let token;
   if (opts.token !== void 0) {
     token = opts.token;
@@ -7393,7 +7504,7 @@ async function start(opts = {}) {
   let mdnsService = null;
   const pairingManager = new PairingManager({
     token,
-    serverName: (0, import_node_os9.hostname)(),
+    serverName: (0, import_node_os11.hostname)(),
     version: "0.2.0",
     onStateChange: (state) => mdnsService?.updatePairingState(state)
   });
@@ -8201,7 +8312,7 @@ async function start(opts = {}) {
 var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 function getPackageVersion() {
   try {
-    const pkg = JSON.parse((0, import_node_fs4.readFileSync)((0, import_node_path10.join)(__dirname, "..", "package.json"), "utf8"));
+    const pkg = JSON.parse((0, import_node_fs6.readFileSync)((0, import_node_path12.join)(__dirname, "..", "package.json"), "utf8"));
     return pkg.version ?? "0.0.0";
   } catch {
     return "0.0.0";
@@ -8345,7 +8456,7 @@ ${t("startup.pairingReopened")}`);
   }
 }
 function getLocalIp() {
-  const interfaces = (0, import_node_os10.networkInterfaces)();
+  const interfaces = (0, import_node_os12.networkInterfaces)();
   for (const iface of Object.values(interfaces)) {
     for (const addr of iface ?? []) {
       if (addr.family === "IPv4" && !addr.internal) {

package/dist/server.js

@@ -309,8 +309,8 @@ function t(key, params) {
 // src/server.ts
 var import_uuid8 = require("uuid");
 var import_promises7 = require("fs/promises");
-var import_node_os9 = require("os");
-var import_node_path9 = require("path");
+var import_node_os11 = require("os");
+var import_node_path11 = require("path");
 var import_node_child_process12 = require("child_process");
 var import_node_util3 = require("util");
 var import_node_v8 = require("v8");
@@ -451,6 +451,21 @@ var import_promises = require("fs/promises");
 var import_readline = require("readline");
 var import_path = require("path");
 var import_os = require("os");
+
+// src/utils/modelValidation.ts
+function isUsableModel(model) {
+  if (typeof model !== "string") return false;
+  const trimmed = model.trim();
+  if (!trimmed) return false;
+  if (trimmed === "unknown") return false;
+  if (trimmed.startsWith("<")) return false;
+  return true;
+}
+function sanitizeModel(model) {
+  return isUsableModel(model) ? model.trim() : void 0;
+}
+
+// src/session/ProjectReader.ts
 var CLAUDE_PROJECTS_DIR = (0, import_path.join)((0, import_os.homedir)(), ".claude", "projects");
 function getSessionFilePath(projectPath, sessionId) {
   return (0, import_path.join)(CLAUDE_PROJECTS_DIR, encodeDirName(projectPath), `${sessionId}.jsonl`);
@@ -471,7 +486,7 @@ async function getSessionModel(projectPath, sessionId) {
         const obj = JSON.parse(line);
         if (obj.type !== "assistant" || !obj.message) continue;
         const model = obj.message.model;
-        if (typeof model === "string" && model && model !== "unknown") {
+        if (isUsableModel(model)) {
           lastModel = model;
         }
       } catch {
@@ -1089,17 +1104,22 @@ var ProcessProvider = class {
     } else {
       args.push("--session-id", sessionId);
     }
-    if (model) {
-      args.push("--model", model);
+    const safeModel = sanitizeModel(model);
+    if (model && !safeModel) {
+      console.warn(`[ProcessProvider] Session ${sessionId}: ignoring invalid model "${model}", falling back to CLI default`);
+    }
+    if (safeModel) {
+      args.push("--model", safeModel);
     }
+    const safeFallbackModel = sanitizeModel(fallbackModel);
     if (permissionMode && permissionMode !== "default") {
       args.push("--permission-mode", permissionMode);
     }
     if (effort) {
       args.push("--effort", effort);
     }
-    if (fallbackModel) {
-      args.push("--fallback-model", fallbackModel);
+    if (safeFallbackModel) {
+      args.push("--fallback-model", safeFallbackModel);
     }
     if (maxBudgetUsd != null) {
       args.push("--max-budget-usd", String(maxBudgetUsd));
@@ -5133,6 +5153,36 @@ var DesktopNotificationChannel = class {
   }
 };
 
+// src/notification/pushTokenStore.ts
+var import_node_fs4 = require("fs");
+var import_node_os7 = require("os");
+var import_node_path6 = require("path");
+var DEFAULT_PUSH_TOKENS_FILE = (0, import_node_path6.join)((0, import_node_os7.homedir)(), ".sessix", "push-tokens.json");
+function loadPushTokens(filePath = DEFAULT_PUSH_TOKENS_FILE) {
+  try {
+    const parsed = JSON.parse((0, import_node_fs4.readFileSync)(filePath, "utf-8"));
+    if (!Array.isArray(parsed)) return [];
+    return parsed.filter((t2) => typeof t2 === "string");
+  } catch {
+    return [];
+  }
+}
+function savePushTokens(tokens, filePath = DEFAULT_PUSH_TOKENS_FILE) {
+  const deduped = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const t2 of tokens) {
+    if (typeof t2 !== "string" || seen.has(t2)) continue;
+    seen.add(t2);
+    deduped.push(t2);
+  }
+  try {
+    (0, import_node_fs4.mkdirSync)((0, import_node_path6.dirname)(filePath), { recursive: true });
+    (0, import_node_fs4.writeFileSync)(filePath, JSON.stringify(deduped, null, 2), "utf-8");
+  } catch (err) {
+    console.warn("[pushTokenStore] \u5199\u5165 push token \u5931\u8D25:", err);
+  }
+}
+
 // src/notification/ExpoNotificationChannel.ts
 var EXPO_PUSH_API = "https://exp.host/--/api/v2/push/send";
 var EXPO_RECEIPT_API = "https://exp.host/--/api/v2/push/getReceipts";
@@ -5143,18 +5193,35 @@ var ExpoNotificationChannel = class {
   tokenWsMap = /* @__PURE__ */ new Map();
   /** per-token 通知音效偏好 */
   soundPreferences = /* @__PURE__ */ new Map();
+  /** push token 持久化文件路径 */
+  pushTokensFile;
+  constructor(opts = {}) {
+    this.pushTokensFile = opts.pushTokensFile ?? DEFAULT_PUSH_TOKENS_FILE;
+    for (const token of loadPushTokens(this.pushTokensFile)) {
+      this.tokens.add(token);
+    }
+    if (this.tokens.size > 0) {
+      console.log(`[ExpoNotificationChannel] \u4ECE\u78C1\u76D8\u91CD\u8F7D ${this.tokens.size} \u4E2A push token`);
+    }
+  }
+  /** 把当前 token 集合落盘，供进程重启后重载。 */
+  persist() {
+    savePushTokens(Array.from(this.tokens), this.pushTokensFile);
+  }
   isAvailable() {
     return this.tokens.size > 0;
   }
   addToken(token, ws) {
     this.tokens.add(token);
     if (ws) this.tokenWsMap.set(token, ws);
+    this.persist();
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRegistered", { count: this.tokens.size })}`);
   }
   removeToken(token) {
     this.tokens.delete(token);
     this.tokenWsMap.delete(token);
     this.soundPreferences.delete(token);
+    this.persist();
     console.log(`[ExpoNotificationChannel] ${t("notification.tokenRemoved", { count: this.tokens.size })}`);
   }
   /** 更新某个 token 的音效偏好 */
@@ -5226,6 +5293,7 @@ var ExpoNotificationChannel = class {
               this.tokens.delete(staleToken);
               this.tokenWsMap.delete(staleToken);
               this.soundPreferences.delete(staleToken);
+              this.persist();
               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`);
             }
           } else if (ticket.status === "ok" && typeof ticket.id === "string" && targetTokens[i]) {
@@ -5272,6 +5340,7 @@ var ExpoNotificationChannel = class {
             this.tokens.delete(token);
             this.tokenWsMap.delete(token);
             this.soundPreferences.delete(token);
+            this.persist();
             console.warn("[ExpoNotificationChannel] \u26A0\uFE0F  \u5DF2\u79FB\u9664\u5931\u6548 token\uFF08receipt DeviceNotRegistered\uFF09\u3002\u91CD\u542F App \u53EF\u91CD\u65B0\u6CE8\u518C\u3002");
           } else if (errorCode === "InvalidCredentials" || errorCode === "MismatchSenderId") {
             console.error(
@@ -5771,6 +5840,9 @@ var PairingManager = class {
 
 // src/utils/shellPath.ts
 var import_node_child_process7 = require("child_process");
+var import_node_fs5 = require("fs");
+var import_node_path7 = require("path");
+var import_node_os8 = require("os");
 var fixed = false;
 function fixShellPath() {
   if (fixed || isWindows) {
@@ -5778,23 +5850,62 @@ function fixShellPath() {
     return;
   }
   fixed = true;
+  const fromShell = readLoginShellPath();
+  if (fromShell) {
+    process.env.PATH = mergePath(fromShell, process.env.PATH || "");
+  }
+  const stableNodeDir = resolveStableNodeDir();
+  if (stableNodeDir) {
+    process.env.PATH = mergePath(stableNodeDir, process.env.PATH || "");
+  }
+}
+function readLoginShellPath() {
   const shell = process.env.SHELL || "/bin/zsh";
   const isFish = /\/fish$/.test(shell);
   const printPathCmd = isFish ? "string join : $PATH" : 'printf "%s" "$PATH"';
-  let raw;
+  for (const flags of [["-i", "-l", "-c"], ["-l", "-c"]]) {
+    try {
+      const raw = (0, import_node_child_process7.execFileSync)(shell, [...flags, printPathCmd], {
+        encoding: "utf8",
+        timeout: 4e3,
+        stdio: ["ignore", "pipe", "ignore"]
+      }).trim();
+      if (raw) return raw;
+    } catch {
+    }
+  }
+  return null;
+}
+function resolveStableNodeDir() {
+  const exe = isWindows ? "node.exe" : "node";
+  for (const dir of (process.env.PATH || "").split(":")) {
+    if (!dir) continue;
+    try {
+      const p = (0, import_node_path7.join)(dir, exe);
+      (0, import_node_fs5.accessSync)(p, import_node_fs5.constants.X_OK);
+      return (0, import_node_path7.dirname)((0, import_node_fs5.realpathSync)(p));
+    } catch {
+    }
+  }
+  return scanFnmNodeDir();
+}
+function scanFnmNodeDir() {
+  const base = (0, import_node_path7.join)((0, import_node_os8.homedir)(), ".fnm", "node-versions");
   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 versions = (0, import_node_fs5.readdirSync)(base).filter((v) => /^v?\d+\./.test(v)).sort(
+      (a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })
+    );
+    for (const v of versions) {
+      const dir = (0, import_node_path7.join)(base, v, "installation", "bin");
+      try {
+        (0, import_node_fs5.accessSync)((0, import_node_path7.join)(dir, "node"), import_node_fs5.constants.X_OK);
+        return dir;
+      } catch {
+      }
+    }
+  } catch {
   }
-  const fromShell = raw.trim();
-  if (!fromShell) return;
-  process.env.PATH = mergePath(fromShell, process.env.PATH || "");
+  return null;
 }
 function mergePath(primary, secondary) {
   const seen = /* @__PURE__ */ new Set();
@@ -6028,13 +6139,13 @@ var TerminalExecutor = class {
 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_node_path8 = require("path");
+var import_node_os9 = require("os");
 var import_uuid5 = require("uuid");
 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");
+var CONFIG_FILE = (0, import_node_path8.join)((0, import_node_os9.homedir)(), ".sessix", "xcode-config.json");
 var SKIP_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -6087,7 +6198,7 @@ var XcodeBuildExecutor = class {
     return this.configCache;
   }
   async writeConfigs(store) {
-    await (0, import_promises4.mkdir)((0, import_node_path6.join)((0, import_node_os7.homedir)(), ".sessix"), { recursive: true });
+    await (0, import_promises4.mkdir)((0, import_node_path8.join)((0, import_node_os9.homedir)(), ".sessix"), { recursive: true });
     await (0, import_promises4.writeFile)(CONFIG_FILE, JSON.stringify(store, null, 2), "utf8");
     this.configCache = store;
   }
@@ -6140,7 +6251,7 @@ var XcodeBuildExecutor = class {
       if (SKIP_DIRS.has(name)) continue;
       if (name.startsWith(".")) continue;
       if (name.endsWith(".xcodeproj") || name.endsWith(".xcworkspace")) continue;
-      const childPath = (0, import_node_path6.join)(currentPath, name);
+      const childPath = (0, import_node_path8.join)(currentPath, name);
       await this.scanDir(rootPath, childPath, depth + 1, results);
     }
   }
@@ -6367,7 +6478,7 @@ ${e.stderr ?? ""}`);
     if (!builtDir || !productName) {
       throw new Error("\u65E0\u6CD5\u4ECE -showBuildSettings \u4E2D\u8BFB\u53D6 BUILT_PRODUCTS_DIR / FULL_PRODUCT_NAME");
     }
-    return (0, import_node_path6.join)(builtDir, productName);
+    return (0, import_node_path8.join)(builtDir, productName);
   }
   // ============================================
   // 清理
@@ -6439,7 +6550,7 @@ function kindOrder(k) {
 
 // src/commands/CommandDiscovery.ts
 var import_promises5 = require("fs/promises");
-var import_node_path7 = require("path");
+var import_node_path9 = require("path");
 var import_node_crypto = require("crypto");
 var CACHE_TTL_MS = 5 * 60 * 1e3;
 var MAX_README_BYTES = 256 * 1024;
@@ -6463,7 +6574,7 @@ var CommandDiscovery = class {
       this.scanReadme(projectPath, "CLAUDE.md", "claude.md", collector)
     ]);
     for (const sub of SUBPACKAGE_DIRS) {
-      const subRoot = (0, import_node_path7.join)(projectPath, sub);
+      const subRoot = (0, import_node_path9.join)(projectPath, sub);
       let entries;
       try {
         entries = await (0, import_promises5.readdir)(subRoot);
@@ -6473,7 +6584,7 @@ var CommandDiscovery = class {
       let scanned = 0;
       for (const name of entries) {
         if (name.startsWith(".") || scanned >= MAX_SCAN_PER_DIR) continue;
-        const childAbs = (0, import_node_path7.join)(subRoot, name);
+        const childAbs = (0, import_node_path9.join)(subRoot, name);
         try {
           const s = await (0, import_promises5.stat)(childAbs);
           if (!s.isDirectory()) continue;
@@ -6514,7 +6625,7 @@ var CommandDiscovery = class {
   // ============================================
   async scanPackageJson(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/package.json` : "package.json";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     let raw;
     try {
       raw = await (0, import_promises5.readFile)(abs, "utf8");
@@ -6545,7 +6656,7 @@ var CommandDiscovery = class {
   }
   async scanMakefile(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/Makefile` : "Makefile";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     let raw;
     try {
       raw = await (0, import_promises5.readFile)(abs, "utf8");
@@ -6586,7 +6697,7 @@ var CommandDiscovery = class {
   }
   async scanJustfile(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/justfile` : "justfile";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     let raw;
     try {
       raw = await (0, import_promises5.readFile)(abs, "utf8");
@@ -6627,7 +6738,7 @@ var CommandDiscovery = class {
   }
   async scanCargo(rootPath, subDir, out) {
     const file = subDir ? `${subDir}/Cargo.toml` : "Cargo.toml";
-    const abs = (0, import_node_path7.join)(rootPath, file);
+    const abs = (0, import_node_path9.join)(rootPath, file);
     try {
       await (0, import_promises5.stat)(abs);
     } catch {
@@ -6658,7 +6769,7 @@ var CommandDiscovery = class {
     for (const name of ["docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"]) {
       const file = subDir ? `${subDir}/${name}` : name;
       try {
-        await (0, import_promises5.stat)((0, import_node_path7.join)(rootPath, file));
+        await (0, import_promises5.stat)((0, import_node_path9.join)(rootPath, file));
       } catch {
         continue;
       }
@@ -6684,7 +6795,7 @@ var CommandDiscovery = class {
     }
   }
   async scanReadme(rootPath, fileName, source, out) {
-    const abs = (0, import_node_path7.join)(rootPath, fileName);
+    const abs = (0, import_node_path9.join)(rootPath, fileName);
     let raw;
     try {
       const s = await (0, import_promises5.stat)(abs);
@@ -7064,8 +7175,8 @@ var GitExecutor = class {
 
 // src/scheduling/ScheduledSessionManager.ts
 var import_promises6 = require("fs/promises");
-var import_node_os8 = require("os");
-var import_node_path8 = require("path");
+var import_node_os10 = require("os");
+var import_node_path10 = require("path");
 var import_uuid7 = require("uuid");
 var MAX_TIMEOUT_MS = 2147483647;
 var ScheduledSessionManager = class {
@@ -7076,7 +7187,7 @@ var ScheduledSessionManager = class {
   onFired;
   persistTimer = null;
   constructor(opts) {
-    this.storeFile = opts.storeFile ?? (0, import_node_path8.join)((0, import_node_os8.homedir)(), ".sessix", "scheduled-sessions.json");
+    this.storeFile = opts.storeFile ?? (0, import_node_path10.join)((0, import_node_os10.homedir)(), ".sessix", "scheduled-sessions.json");
     this.onFire = opts.onFire;
     this.onChange = opts.onChange;
     this.onFired = opts.onFired;
@@ -7181,7 +7292,7 @@ var ScheduledSessionManager = class {
     this.persistTimer = setTimeout(() => {
       this.persistTimer = null;
       const tasks = [...this.tasks.values()].map((e) => e.task);
-      (0, import_promises6.mkdir)((0, import_node_path8.join)(this.storeFile, ".."), { recursive: true }).then(() => (0, import_promises6.writeFile)(this.storeFile, JSON.stringify(tasks, null, 2), "utf8")).catch((err) => {
+      (0, import_promises6.mkdir)((0, import_node_path10.join)(this.storeFile, ".."), { recursive: true }).then(() => (0, import_promises6.writeFile)(this.storeFile, JSON.stringify(tasks, null, 2), "utf8")).catch((err) => {
         console.error("[ScheduledSessionManager] persist error:", err);
       });
     }, 500);
@@ -7285,7 +7396,7 @@ async function killPortProcess(port) {
   }
 }
 async function loadApnsConfigFromFile() {
-  const path2 = (0, import_node_path9.join)((0, import_node_os9.homedir)(), ".sessix", "apns.json");
+  const path2 = (0, import_node_path11.join)((0, import_node_os11.homedir)(), ".sessix", "apns.json");
   try {
     const raw = await (0, import_promises7.readFile)(path2, "utf8");
     const cfg = JSON.parse(raw);
@@ -7332,8 +7443,8 @@ 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");
+  const configDir = (0, import_node_path11.join)((0, import_node_os11.homedir)(), ".sessix");
+  const tokenFile = (0, import_node_path11.join)(configDir, "token");
   let token;
   if (opts.token !== void 0) {
     token = opts.token;
@@ -7398,7 +7509,7 @@ async function start(opts = {}) {
   let mdnsService = null;
   const pairingManager = new PairingManager({
     token,
-    serverName: (0, import_node_os9.hostname)(),
+    serverName: (0, import_node_os11.hostname)(),
     version: "0.2.0",
     onStateChange: (state) => mdnsService?.updatePairingState(state)
   });

package/package.json

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