sessix-server 0.2.6 → 0.2.7

package/dist/index.js

@@ -46,7 +46,10 @@ var zh = {
     autoDiscoveryHint: "     \u5982\u5728\u516C\u5171\u7F51\u7EDC\uFF0C\u5EFA\u8BAE\u5173\u95ED: SESSIX_AUTO_CONNECT=false npx sessix-server",
     autoDiscoveryOff: "  \u2139\uFE0F  \u81EA\u52A8\u53D1\u73B0\u5DF2\u5173\u95ED\uFF0C\u624B\u673A\u9700\u624B\u52A8\u8F93\u5165\u5730\u5740\u8FDE\u63A5",
     pairingOpen: "  \u{1F513} \u914D\u5BF9\u6A21\u5F0F\u5DF2\u5F00\u542F\uFF085 \u5206\u949F\u5185\u6709\u6548\uFF09\u2014 \u6309 p \u91CD\u65B0\u5F00\u542F",
+    pressT: "  \u{1F511} \u6309 t \u91CD\u7F6E Token\uFF08\u6CC4\u9732\u540E\u5237\u65B0\uFF09",
     pairingReopened: "\u{1F513} \u914D\u5BF9\u6A21\u5F0F\u5DF2\u91CD\u65B0\u5F00\u542F\uFF085 \u5206\u949F\uFF09",
+    tokenRegenerated: "\u{1F511} Token \u5DF2\u91CD\u7F6E\uFF0C\u6240\u6709\u5BA2\u6237\u7AEF\u5DF2\u65AD\u5F00\uFF0C\u8BF7\u91CD\u65B0\u626B\u7801\u914D\u5BF9",
+    tokenRegenerateFailed: "Token \u91CD\u7F6E\u5931\u8D25:",
     updateAvailable: "\u53D1\u73B0\u65B0\u7248\u672C v{{latest}}\uFF08\u5F53\u524D v{{current}}\uFF09\uFF0C\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0\uFF1A",
     receivedSignal: "\u6536\u5230 {{signal}}\uFF0C\u6B63\u5728\u4F18\u96C5\u5173\u95ED...",
     goodbye: "\u6240\u6709\u670D\u52A1\u5DF2\u5173\u95ED\uFF0C\u518D\u89C1\uFF01",
@@ -75,7 +78,8 @@ var zh = {
     activityPushEnabled: "ActivityKit Push \u5DF2\u542F\u7528",
     activityPushFailed: "ActivityKit Push \u521D\u59CB\u5316\u5931\u8D25:",
     activityPushContinue: "\u7EE7\u7EED\u542F\u52A8\uFF08Live Activity \u540E\u53F0\u63A8\u9001\u4E0D\u53EF\u7528\uFF09",
-    noActiveLoginProcess: "\u6CA1\u6709\u6D3B\u8DC3\u7684\u767B\u5F55\u8FDB\u7A0B"
+    noActiveLoginProcess: "\u6CA1\u6709\u6D3B\u8DC3\u7684\u767B\u5F55\u8FDB\u7A0B",
+    tokenRegenerated: "Token \u5DF2\u91CD\u7F6E: {{token}}"
   },
   ws: {
     started: "WebSocket \u670D\u52A1\u5DF2\u542F\u52A8\uFF0C\u7AEF\u53E3 {{port}}",
@@ -152,7 +156,10 @@ var en = {
     autoDiscoveryHint: "     On public networks, disable with: SESSIX_AUTO_CONNECT=false npx sessix-server",
     autoDiscoveryOff: "  Auto-discovery disabled, phone must enter address manually",
     pairingOpen: "  \u{1F513} Pairing mode open (5 min) \u2014 press p to reopen",
+    pressT: "  \u{1F511} Press t to regenerate token (refresh after leak)",
     pairingReopened: "\u{1F513} Pairing mode reopened (5 min)",
+    tokenRegenerated: "\u{1F511} Token regenerated, all clients disconnected. Scan QR to re-pair",
+    tokenRegenerateFailed: "Token regeneration failed:",
     updateAvailable: "New version v{{latest}} available (current v{{current}}). Update with:",
     receivedSignal: "Received {{signal}}, graceful shutdown...",
     goodbye: "All services closed, goodbye!",
@@ -181,7 +188,8 @@ var en = {
     activityPushEnabled: "ActivityKit Push enabled",
     activityPushFailed: "ActivityKit Push init failed:",
     activityPushContinue: "Continuing startup (Live Activity background push unavailable)",
-    noActiveLoginProcess: "No active login process"
+    noActiveLoginProcess: "No active login process",
+    tokenRegenerated: "Token regenerated: {{token}}"
   },
   ws: {
     started: "WebSocket server started on port {{port}}",
@@ -287,11 +295,11 @@ function t(key, params) {
 }
 
 // src/server.ts
-var import_uuid4 = require("uuid");
+var import_uuid5 = require("uuid");
 var import_promises4 = require("fs/promises");
 var import_node_os6 = require("os");
 var import_node_path5 = require("path");
-var import_node_child_process4 = require("child_process");
+var import_node_child_process5 = require("child_process");
 var import_node_util = require("util");
 
 // src/providers/ProcessProvider.ts
@@ -1538,6 +1546,13 @@ var WsBridge = class _WsBridge {
   getConnectionCount() {
     return this.wss.clients.size;
   }
+  /** 更新 token 并断开所有现有连接（token 刷新后需重新配对） */
+  updateToken(newToken) {
+    this.token = newToken;
+    for (const ws of this.wss.clients) {
+      ws.close(4001, "Token regenerated");
+    }
+  }
   /** 优雅关闭 WebSocket 服务 */
   close() {
     return new Promise((resolve, reject) => {
@@ -1977,6 +1992,10 @@ var ApprovalProxy = class _ApprovalProxy {
       });
     }
   }
+  /** 更新 token（token 刷新时调用） */
+  updateToken(newToken) {
+    this.token = newToken;
+  }
   /** 返回连接 token（仅本机访问） */
   handleToken(req, res) {
     const remoteAddress = req.socket.remoteAddress;
@@ -3245,6 +3264,9 @@ var PairingManager = class {
     this.close();
     return result;
   }
+  updateToken(newToken) {
+    this.token = newToken;
+  }
   getRemainingSeconds() {
     if (this._state !== "open") return 0;
     return Math.max(0, Math.ceil((this.deadline - Date.now()) / 1e3));
@@ -3377,9 +3399,98 @@ var AuthManager = class extends import_events2.EventEmitter {
 
 // src/server.ts
 var import_promises5 = require("fs/promises");
+
+// src/terminal/TerminalExecutor.ts
+var import_node_child_process4 = require("child_process");
+var import_uuid4 = require("uuid");
+var EXEC_TIMEOUT_MS = 5 * 60 * 1e3;
+var TerminalExecutor = class {
+  processes = /* @__PURE__ */ new Map();
+  eventCallbacks = [];
+  onEvent(callback) {
+    this.eventCallbacks.push(callback);
+    return () => {
+      const idx = this.eventCallbacks.indexOf(callback);
+      if (idx !== -1) this.eventCallbacks.splice(idx, 1);
+    };
+  }
+  emit(event) {
+    for (const cb of this.eventCallbacks) {
+      try {
+        cb(event);
+      } catch (err) {
+        console.error("[TerminalExecutor] Event callback error:", err);
+      }
+    }
+  }
+  exec(sessionId, command, cwd) {
+    const execId = (0, import_uuid4.v4)();
+    const shell = isWindows ? "powershell" : "bash";
+    const args = isWindows ? ["-Command", command] : ["-c", command];
+    const proc = (0, import_node_child_process4.spawn)(shell, args, {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env }
+    });
+    this.processes.set(execId, proc);
+    proc.stdout?.on("data", (chunk) => {
+      this.emit({
+        type: "terminal_output",
+        sessionId,
+        execId,
+        stream: "stdout",
+        data: chunk.toString()
+      });
+    });
+    proc.stderr?.on("data", (chunk) => {
+      this.emit({
+        type: "terminal_output",
+        sessionId,
+        execId,
+        stream: "stderr",
+        data: chunk.toString()
+      });
+    });
+    proc.on("exit", (code, signal) => {
+      clearTimeout(timer);
+      this.processes.delete(execId);
+      this.emit({
+        type: "terminal_exit",
+        sessionId,
+        execId,
+        code,
+        signal
+      });
+    });
+    const timer = setTimeout(() => {
+      if (this.processes.has(execId)) {
+        killProcessCrossPlatform(proc);
+      }
+    }, EXEC_TIMEOUT_MS);
+    console.log(`[TerminalExecutor] exec ${execId}: ${command.substring(0, 100)} (cwd: ${cwd})`);
+    return execId;
+  }
+  kill(execId) {
+    const proc = this.processes.get(execId);
+    if (proc) {
+      killProcessCrossPlatform(proc);
+      console.log(`[TerminalExecutor] kill ${execId}`);
+    }
+  }
+  destroy() {
+    for (const [execId, proc] of this.processes) {
+      killProcessCrossPlatform(proc);
+      console.log(`[TerminalExecutor] cleanup ${execId}`);
+    }
+    this.processes.clear();
+    this.eventCallbacks.length = 0;
+  }
+};
+
+// src/server.ts
 var WS_PORT = 3745;
 var HTTP_PORT = 3746;
-var execAsync = (0, import_node_util.promisify)(import_node_child_process4.exec);
+var execAsync = (0, import_node_util.promisify)(import_node_child_process5.exec);
 async function killPortProcess(port) {
   try {
     if (isWindows) {
@@ -3434,7 +3545,7 @@ async function start(opts = {}) {
       try {
         token = (await (0, import_promises4.readFile)(tokenFile, "utf8")).trim();
       } catch {
-        token = (0, import_uuid4.v4)();
+        token = (0, import_uuid5.v4)();
         await (0, import_promises4.mkdir)(configDir, { recursive: true });
         await (0, import_promises4.writeFile)(tokenFile, token, "utf8");
       }
@@ -3442,6 +3553,20 @@ async function start(opts = {}) {
   }
   const provider = new ProcessProvider();
   const sessionManager = new SessionManager(provider);
+  const terminalExecutor = new TerminalExecutor();
+  const wsBridge = await createWithRetry(
+    "WsBridge",
+    WS_PORT,
+    () => WsBridge.create({ port: WS_PORT, token })
+  );
+  const unreadSessionIds = /* @__PURE__ */ new Set();
+  sessionManager.onEvent((event) => {
+    if (event.type === "status_change" && (event.status === "idle" || event.status === "error")) {
+      if (!wsBridge.isViewingSession(event.sessionId)) {
+        unreadSessionIds.add(event.sessionId);
+      }
+    }
+  });
   const expoChannel = new ExpoNotificationChannel();
   const notificationService = new NotificationService(sessionManager, expoChannel);
   notificationService.addChannel("expo", expoChannel, opts.enableExpoPush !== false);
@@ -3456,11 +3581,6 @@ async function start(opts = {}) {
       console.log(`[Server] ${t("server.activityPushContinue")}`);
     }
   }
-  const wsBridge = await createWithRetry(
-    "WsBridge",
-    WS_PORT,
-    () => WsBridge.create({ port: WS_PORT, token })
-  );
   const sessionFileWatcher = new SessionFileWatcher((event) => {
     wsBridge.broadcast(event);
   });
@@ -3489,7 +3609,6 @@ async function start(opts = {}) {
       });
     }
   });
-  const unreadSessionIds = /* @__PURE__ */ new Set();
   notificationService.setGlobalPendingCountProvider(
     () => approvalProxy.getPendingCount() + sessionManager.getAllPendingQuestions().length + unreadSessionIds.size
   );
@@ -3520,6 +3639,8 @@ async function start(opts = {}) {
       switch (event.type) {
         case "create_session": {
           await (0, import_promises4.mkdir)(event.projectPath, { recursive: true });
+          const resumeId = event.resumeSessionId ?? event.newSessionId;
+          if (resumeId) sessionFileWatcher.unwatch(resumeId);
           await sessionManager.createSession(
             event.projectPath,
             event.message,
@@ -3537,6 +3658,7 @@ async function start(opts = {}) {
           break;
         }
         case "send_message": {
+          sessionFileWatcher.unwatch(event.sessionId);
           await sessionManager.sendMessage(event.sessionId, event.message, event.permissionMode, event.images);
           wsBridge.broadcast({
             type: "session_list",
@@ -3625,6 +3747,10 @@ async function start(opts = {}) {
               code: "PROJECT_LIST_ERROR"
             });
           }
+          wsBridge.send(ws, {
+            type: "session_list",
+            sessions: sessionManager.getActiveSessions()
+          });
           break;
         }
         case "list_sessions": {
@@ -3719,6 +3845,20 @@ async function start(opts = {}) {
           notificationService.setSoundPreferences(event.preferences);
           break;
         }
+        case "terminal_exec": {
+          const activeSession = sessionManager.getActiveSessions().find((s) => s.id === event.sessionId);
+          const cwd = activeSession?.projectPath ?? sessionManager.getSessionProjectPath(event.sessionId);
+          if (!cwd) {
+            wsBridge.send(ws, { type: "error", code: "TERMINAL_EXEC_ERROR", message: "Session not found or no project path", sessionId: event.sessionId });
+            break;
+          }
+          terminalExecutor.exec(event.sessionId, event.command, cwd);
+          break;
+        }
+        case "terminal_kill": {
+          terminalExecutor.kill(event.execId);
+          break;
+        }
         case "register_activity_push_token": {
           notificationService.addActivityPushToken(event.sessionId, event.token);
           break;
@@ -3790,12 +3930,14 @@ async function start(opts = {}) {
   sessionManager.onEvent((event) => {
     wsBridge.broadcast(event);
     if (event.type === "status_change" && (event.status === "idle" || event.status === "error")) {
-      if (!wsBridge.isViewingSession(event.sessionId)) {
-        unreadSessionIds.add(event.sessionId);
+      if (unreadSessionIds.has(event.sessionId)) {
         broadcastUnreadSessions();
       }
     }
   });
+  terminalExecutor.onEvent((event) => {
+    wsBridge.broadcast(event);
+  });
   wsBridge.onDisconnect(() => {
     if (wsBridge.getConnectionCount() === 0 && approvalProxy.getPendingCount() > 0) {
       approvalProxy.approveAll(t("server.phoneDisconnected"));
@@ -3895,6 +4037,7 @@ async function start(opts = {}) {
     await attempt(() => wsBridge.close(), "WebSocket");
     await attempt(() => approvalProxy.close(), "ApprovalProxy");
     await attempt(() => sessionManager.destroy(), "SessionManager");
+    await attempt(() => terminalExecutor.destroy(), "TerminalExecutor");
     await attempt(() => notificationService.destroy(), "NotificationService");
     await attempt(() => sessionFileWatcher.destroy(), "SessionFileWatcher");
     if (errors.length > 0) {
@@ -3903,7 +4046,7 @@ async function start(opts = {}) {
     }
     console.log(`[Server] ${t("server.shutdownComplete")}`);
   };
-  return {
+  const instance = {
     token,
     wsPort: WS_PORT,
     httpPort: HTTP_PORT,
@@ -3921,8 +4064,21 @@ async function start(opts = {}) {
       }
     },
     openPairing: (duration) => pairingManager.open(duration),
-    closePairing: () => pairingManager.close()
+    closePairing: () => pairingManager.close(),
+    regenerateToken: async () => {
+      const newToken = (0, import_uuid5.v4)();
+      await (0, import_promises4.mkdir)(configDir, { recursive: true });
+      await (0, import_promises4.writeFile)(tokenFile, newToken, "utf8");
+      instance.token = newToken;
+      wsBridge.updateToken(newToken);
+      approvalProxy.updateToken(newToken);
+      pairingManager.updateToken(newToken);
+      pairingManager.open();
+      console.log(`[Server] ${t("server.tokenRegenerated", { token: newToken })}`);
+      return newToken;
+    }
   };
+  return instance;
 }
 
 // src/index.ts
@@ -3994,6 +4150,7 @@ async function main() {
   console.log(t("startup.waitingConnection"));
   console.log();
   console.log(t("startup.pairingOpen"));
+  console.log(t("startup.pressT"));
   console.log();
   fetchLatestVersion().then((latest) => {
     if (!latest || latest === PKG_VERSION) return;
@@ -4024,6 +4181,23 @@ async function main() {
         console.log(`
 ${t("startup.pairingReopened")}`);
       }
+      if (key === "t" || key === "T") {
+        server.regenerateToken().then((newToken) => {
+          console.log();
+          console.log(`  ${t("startup.tokenRegenerated")}`);
+          console.log(t("startup.token", { token: newToken }));
+          console.log();
+          const newQrUrl = buildQrUrl(getLocalIp(), server.wsPort, newToken);
+          console.log(t("startup.scanToPair"));
+          import_qrcode_terminal.default.generate(newQrUrl, { small: true }, (qr) => {
+            qr.split("\n").forEach((line) => console.log(`  ${line}`));
+          });
+          console.log();
+        }).catch((err) => {
+          console.error(`
+  ${t("startup.tokenRegenerateFailed")}`, err);
+        });
+      }
       if (key === "") {
         shutdown("SIGINT");
       }

package/dist/server.d.ts

@@ -19,6 +19,8 @@ interface ServerInstance {
     openPairing: (duration?: number) => void;
     /** 运行时关闭配对窗口 */
     closePairing: () => void;
+    /** 重新生成 token（泄露后刷新），断开所有客户端并开启配对窗口 */
+    regenerateToken: () => Promise<string>;
 }
 interface ServerOptions {
     /** 覆盖 token（默认读取 ~/.sessix/token 或自动生成） */

package/dist/server.js

@@ -52,7 +52,10 @@ var zh = {
     autoDiscoveryHint: "     \u5982\u5728\u516C\u5171\u7F51\u7EDC\uFF0C\u5EFA\u8BAE\u5173\u95ED: SESSIX_AUTO_CONNECT=false npx sessix-server",
     autoDiscoveryOff: "  \u2139\uFE0F  \u81EA\u52A8\u53D1\u73B0\u5DF2\u5173\u95ED\uFF0C\u624B\u673A\u9700\u624B\u52A8\u8F93\u5165\u5730\u5740\u8FDE\u63A5",
     pairingOpen: "  \u{1F513} \u914D\u5BF9\u6A21\u5F0F\u5DF2\u5F00\u542F\uFF085 \u5206\u949F\u5185\u6709\u6548\uFF09\u2014 \u6309 p \u91CD\u65B0\u5F00\u542F",
+    pressT: "  \u{1F511} \u6309 t \u91CD\u7F6E Token\uFF08\u6CC4\u9732\u540E\u5237\u65B0\uFF09",
     pairingReopened: "\u{1F513} \u914D\u5BF9\u6A21\u5F0F\u5DF2\u91CD\u65B0\u5F00\u542F\uFF085 \u5206\u949F\uFF09",
+    tokenRegenerated: "\u{1F511} Token \u5DF2\u91CD\u7F6E\uFF0C\u6240\u6709\u5BA2\u6237\u7AEF\u5DF2\u65AD\u5F00\uFF0C\u8BF7\u91CD\u65B0\u626B\u7801\u914D\u5BF9",
+    tokenRegenerateFailed: "Token \u91CD\u7F6E\u5931\u8D25:",
     updateAvailable: "\u53D1\u73B0\u65B0\u7248\u672C v{{latest}}\uFF08\u5F53\u524D v{{current}}\uFF09\uFF0C\u8FD0\u884C\u4EE5\u4E0B\u547D\u4EE4\u66F4\u65B0\uFF1A",
     receivedSignal: "\u6536\u5230 {{signal}}\uFF0C\u6B63\u5728\u4F18\u96C5\u5173\u95ED...",
     goodbye: "\u6240\u6709\u670D\u52A1\u5DF2\u5173\u95ED\uFF0C\u518D\u89C1\uFF01",
@@ -81,7 +84,8 @@ var zh = {
     activityPushEnabled: "ActivityKit Push \u5DF2\u542F\u7528",
     activityPushFailed: "ActivityKit Push \u521D\u59CB\u5316\u5931\u8D25:",
     activityPushContinue: "\u7EE7\u7EED\u542F\u52A8\uFF08Live Activity \u540E\u53F0\u63A8\u9001\u4E0D\u53EF\u7528\uFF09",
-    noActiveLoginProcess: "\u6CA1\u6709\u6D3B\u8DC3\u7684\u767B\u5F55\u8FDB\u7A0B"
+    noActiveLoginProcess: "\u6CA1\u6709\u6D3B\u8DC3\u7684\u767B\u5F55\u8FDB\u7A0B",
+    tokenRegenerated: "Token \u5DF2\u91CD\u7F6E: {{token}}"
   },
   ws: {
     started: "WebSocket \u670D\u52A1\u5DF2\u542F\u52A8\uFF0C\u7AEF\u53E3 {{port}}",
@@ -158,7 +162,10 @@ var en = {
     autoDiscoveryHint: "     On public networks, disable with: SESSIX_AUTO_CONNECT=false npx sessix-server",
     autoDiscoveryOff: "  Auto-discovery disabled, phone must enter address manually",
     pairingOpen: "  \u{1F513} Pairing mode open (5 min) \u2014 press p to reopen",
+    pressT: "  \u{1F511} Press t to regenerate token (refresh after leak)",
     pairingReopened: "\u{1F513} Pairing mode reopened (5 min)",
+    tokenRegenerated: "\u{1F511} Token regenerated, all clients disconnected. Scan QR to re-pair",
+    tokenRegenerateFailed: "Token regeneration failed:",
     updateAvailable: "New version v{{latest}} available (current v{{current}}). Update with:",
     receivedSignal: "Received {{signal}}, graceful shutdown...",
     goodbye: "All services closed, goodbye!",
@@ -187,7 +194,8 @@ var en = {
     activityPushEnabled: "ActivityKit Push enabled",
     activityPushFailed: "ActivityKit Push init failed:",
     activityPushContinue: "Continuing startup (Live Activity background push unavailable)",
-    noActiveLoginProcess: "No active login process"
+    noActiveLoginProcess: "No active login process",
+    tokenRegenerated: "Token regenerated: {{token}}"
   },
   ws: {
     started: "WebSocket server started on port {{port}}",
@@ -293,11 +301,11 @@ function t(key, params) {
 }
 
 // src/server.ts
-var import_uuid4 = require("uuid");
+var import_uuid5 = require("uuid");
 var import_promises4 = require("fs/promises");
 var import_node_os6 = require("os");
 var import_node_path5 = require("path");
-var import_node_child_process4 = require("child_process");
+var import_node_child_process5 = require("child_process");
 var import_node_util = require("util");
 
 // src/providers/ProcessProvider.ts
@@ -1544,6 +1552,13 @@ var WsBridge = class _WsBridge {
   getConnectionCount() {
     return this.wss.clients.size;
   }
+  /** 更新 token 并断开所有现有连接（token 刷新后需重新配对） */
+  updateToken(newToken) {
+    this.token = newToken;
+    for (const ws of this.wss.clients) {
+      ws.close(4001, "Token regenerated");
+    }
+  }
   /** 优雅关闭 WebSocket 服务 */
   close() {
     return new Promise((resolve, reject) => {
@@ -1983,6 +1998,10 @@ var ApprovalProxy = class _ApprovalProxy {
       });
     }
   }
+  /** 更新 token（token 刷新时调用） */
+  updateToken(newToken) {
+    this.token = newToken;
+  }
   /** 返回连接 token（仅本机访问） */
   handleToken(req, res) {
     const remoteAddress = req.socket.remoteAddress;
@@ -3251,6 +3270,9 @@ var PairingManager = class {
     this.close();
     return result;
   }
+  updateToken(newToken) {
+    this.token = newToken;
+  }
   getRemainingSeconds() {
     if (this._state !== "open") return 0;
     return Math.max(0, Math.ceil((this.deadline - Date.now()) / 1e3));
@@ -3383,9 +3405,98 @@ var AuthManager = class extends import_events2.EventEmitter {
 
 // src/server.ts
 var import_promises5 = require("fs/promises");
+
+// src/terminal/TerminalExecutor.ts
+var import_node_child_process4 = require("child_process");
+var import_uuid4 = require("uuid");
+var EXEC_TIMEOUT_MS = 5 * 60 * 1e3;
+var TerminalExecutor = class {
+  processes = /* @__PURE__ */ new Map();
+  eventCallbacks = [];
+  onEvent(callback) {
+    this.eventCallbacks.push(callback);
+    return () => {
+      const idx = this.eventCallbacks.indexOf(callback);
+      if (idx !== -1) this.eventCallbacks.splice(idx, 1);
+    };
+  }
+  emit(event) {
+    for (const cb of this.eventCallbacks) {
+      try {
+        cb(event);
+      } catch (err) {
+        console.error("[TerminalExecutor] Event callback error:", err);
+      }
+    }
+  }
+  exec(sessionId, command, cwd) {
+    const execId = (0, import_uuid4.v4)();
+    const shell = isWindows ? "powershell" : "bash";
+    const args = isWindows ? ["-Command", command] : ["-c", command];
+    const proc = (0, import_node_child_process4.spawn)(shell, args, {
+      cwd,
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env }
+    });
+    this.processes.set(execId, proc);
+    proc.stdout?.on("data", (chunk) => {
+      this.emit({
+        type: "terminal_output",
+        sessionId,
+        execId,
+        stream: "stdout",
+        data: chunk.toString()
+      });
+    });
+    proc.stderr?.on("data", (chunk) => {
+      this.emit({
+        type: "terminal_output",
+        sessionId,
+        execId,
+        stream: "stderr",
+        data: chunk.toString()
+      });
+    });
+    proc.on("exit", (code, signal) => {
+      clearTimeout(timer);
+      this.processes.delete(execId);
+      this.emit({
+        type: "terminal_exit",
+        sessionId,
+        execId,
+        code,
+        signal
+      });
+    });
+    const timer = setTimeout(() => {
+      if (this.processes.has(execId)) {
+        killProcessCrossPlatform(proc);
+      }
+    }, EXEC_TIMEOUT_MS);
+    console.log(`[TerminalExecutor] exec ${execId}: ${command.substring(0, 100)} (cwd: ${cwd})`);
+    return execId;
+  }
+  kill(execId) {
+    const proc = this.processes.get(execId);
+    if (proc) {
+      killProcessCrossPlatform(proc);
+      console.log(`[TerminalExecutor] kill ${execId}`);
+    }
+  }
+  destroy() {
+    for (const [execId, proc] of this.processes) {
+      killProcessCrossPlatform(proc);
+      console.log(`[TerminalExecutor] cleanup ${execId}`);
+    }
+    this.processes.clear();
+    this.eventCallbacks.length = 0;
+  }
+};
+
+// src/server.ts
 var WS_PORT = 3745;
 var HTTP_PORT = 3746;
-var execAsync = (0, import_node_util.promisify)(import_node_child_process4.exec);
+var execAsync = (0, import_node_util.promisify)(import_node_child_process5.exec);
 async function killPortProcess(port) {
   try {
     if (isWindows) {
@@ -3440,7 +3551,7 @@ async function start(opts = {}) {
       try {
         token = (await (0, import_promises4.readFile)(tokenFile, "utf8")).trim();
       } catch {
-        token = (0, import_uuid4.v4)();
+        token = (0, import_uuid5.v4)();
         await (0, import_promises4.mkdir)(configDir, { recursive: true });
         await (0, import_promises4.writeFile)(tokenFile, token, "utf8");
       }
@@ -3448,6 +3559,20 @@ async function start(opts = {}) {
   }
   const provider = new ProcessProvider();
   const sessionManager = new SessionManager(provider);
+  const terminalExecutor = new TerminalExecutor();
+  const wsBridge = await createWithRetry(
+    "WsBridge",
+    WS_PORT,
+    () => WsBridge.create({ port: WS_PORT, token })
+  );
+  const unreadSessionIds = /* @__PURE__ */ new Set();
+  sessionManager.onEvent((event) => {
+    if (event.type === "status_change" && (event.status === "idle" || event.status === "error")) {
+      if (!wsBridge.isViewingSession(event.sessionId)) {
+        unreadSessionIds.add(event.sessionId);
+      }
+    }
+  });
   const expoChannel = new ExpoNotificationChannel();
   const notificationService = new NotificationService(sessionManager, expoChannel);
   notificationService.addChannel("expo", expoChannel, opts.enableExpoPush !== false);
@@ -3462,11 +3587,6 @@ async function start(opts = {}) {
       console.log(`[Server] ${t("server.activityPushContinue")}`);
     }
   }
-  const wsBridge = await createWithRetry(
-    "WsBridge",
-    WS_PORT,
-    () => WsBridge.create({ port: WS_PORT, token })
-  );
   const sessionFileWatcher = new SessionFileWatcher((event) => {
     wsBridge.broadcast(event);
   });
@@ -3495,7 +3615,6 @@ async function start(opts = {}) {
       });
     }
   });
-  const unreadSessionIds = /* @__PURE__ */ new Set();
   notificationService.setGlobalPendingCountProvider(
     () => approvalProxy.getPendingCount() + sessionManager.getAllPendingQuestions().length + unreadSessionIds.size
   );
@@ -3526,6 +3645,8 @@ async function start(opts = {}) {
       switch (event.type) {
         case "create_session": {
           await (0, import_promises4.mkdir)(event.projectPath, { recursive: true });
+          const resumeId = event.resumeSessionId ?? event.newSessionId;
+          if (resumeId) sessionFileWatcher.unwatch(resumeId);
           await sessionManager.createSession(
             event.projectPath,
             event.message,
@@ -3543,6 +3664,7 @@ async function start(opts = {}) {
           break;
         }
         case "send_message": {
+          sessionFileWatcher.unwatch(event.sessionId);
           await sessionManager.sendMessage(event.sessionId, event.message, event.permissionMode, event.images);
           wsBridge.broadcast({
             type: "session_list",
@@ -3631,6 +3753,10 @@ async function start(opts = {}) {
               code: "PROJECT_LIST_ERROR"
             });
           }
+          wsBridge.send(ws, {
+            type: "session_list",
+            sessions: sessionManager.getActiveSessions()
+          });
           break;
         }
         case "list_sessions": {
@@ -3725,6 +3851,20 @@ async function start(opts = {}) {
           notificationService.setSoundPreferences(event.preferences);
           break;
         }
+        case "terminal_exec": {
+          const activeSession = sessionManager.getActiveSessions().find((s) => s.id === event.sessionId);
+          const cwd = activeSession?.projectPath ?? sessionManager.getSessionProjectPath(event.sessionId);
+          if (!cwd) {
+            wsBridge.send(ws, { type: "error", code: "TERMINAL_EXEC_ERROR", message: "Session not found or no project path", sessionId: event.sessionId });
+            break;
+          }
+          terminalExecutor.exec(event.sessionId, event.command, cwd);
+          break;
+        }
+        case "terminal_kill": {
+          terminalExecutor.kill(event.execId);
+          break;
+        }
         case "register_activity_push_token": {
           notificationService.addActivityPushToken(event.sessionId, event.token);
           break;
@@ -3796,12 +3936,14 @@ async function start(opts = {}) {
   sessionManager.onEvent((event) => {
     wsBridge.broadcast(event);
     if (event.type === "status_change" && (event.status === "idle" || event.status === "error")) {
-      if (!wsBridge.isViewingSession(event.sessionId)) {
-        unreadSessionIds.add(event.sessionId);
+      if (unreadSessionIds.has(event.sessionId)) {
         broadcastUnreadSessions();
       }
     }
   });
+  terminalExecutor.onEvent((event) => {
+    wsBridge.broadcast(event);
+  });
   wsBridge.onDisconnect(() => {
     if (wsBridge.getConnectionCount() === 0 && approvalProxy.getPendingCount() > 0) {
       approvalProxy.approveAll(t("server.phoneDisconnected"));
@@ -3901,6 +4043,7 @@ async function start(opts = {}) {
     await attempt(() => wsBridge.close(), "WebSocket");
     await attempt(() => approvalProxy.close(), "ApprovalProxy");
     await attempt(() => sessionManager.destroy(), "SessionManager");
+    await attempt(() => terminalExecutor.destroy(), "TerminalExecutor");
     await attempt(() => notificationService.destroy(), "NotificationService");
     await attempt(() => sessionFileWatcher.destroy(), "SessionFileWatcher");
     if (errors.length > 0) {
@@ -3909,7 +4052,7 @@ async function start(opts = {}) {
     }
     console.log(`[Server] ${t("server.shutdownComplete")}`);
   };
-  return {
+  const instance = {
     token,
     wsPort: WS_PORT,
     httpPort: HTTP_PORT,
@@ -3927,8 +4070,21 @@ async function start(opts = {}) {
       }
     },
     openPairing: (duration) => pairingManager.open(duration),
-    closePairing: () => pairingManager.close()
+    closePairing: () => pairingManager.close(),
+    regenerateToken: async () => {
+      const newToken = (0, import_uuid5.v4)();
+      await (0, import_promises4.mkdir)(configDir, { recursive: true });
+      await (0, import_promises4.writeFile)(tokenFile, newToken, "utf8");
+      instance.token = newToken;
+      wsBridge.updateToken(newToken);
+      approvalProxy.updateToken(newToken);
+      pairingManager.updateToken(newToken);
+      pairingManager.open();
+      console.log(`[Server] ${t("server.tokenRegenerated", { token: newToken })}`);
+      return newToken;
+    }
   };
+  return instance;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

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