@fengye404/termpilot 0.2.4 → 0.2.5

package/.env.example

@@ -1,9 +1,9 @@
 PORT=8787
 HOST=127.0.0.1
 DATABASE_URL=postgresql://<your-user>@127.0.0.1:5432/termpilot
-TERMPILOT_DEVICE_ID=pc-main
 TERMPILOT_AGENT_TOKEN=demo-agent-token
-TERMPILOT_CLIENT_TOKEN=demo-client-token
 TERMPILOT_PAIRING_TTL_MINUTES=10
 TERMPILOT_RELAY_URL=ws://127.0.0.1:8787/ws
 TERMPILOT_POLL_INTERVAL_MS=500
+# 可选：仅在你明确需要“管理端看所有设备”时才设置
+# TERMPILOT_CLIENT_TOKEN=your-admin-client-token

package/README.md

@@ -44,6 +44,7 @@ termpilot agent
 2. 端口，默认 `8787`
 
 然后它会自动保存配置、后台启动 agent，并打印一次性配对码。
+第一次配置时还会为这台电脑生成一个唯一设备名，避免多台电脑在同一个 relay 上都挤到 `pc-main`。
 
 ### 3. 手机完成配对
 
@@ -101,6 +102,8 @@ termpilot kill --sid <sid>
 2. `termpilot agent` 适合作为长期后台入口。第一次配置完之后，日常只需要记住这一条命令。
 3. relay 长期使用时，优先挂到 HTTPS/WSS 域名后面；本地演示再用裸 IP 和 `8787`。
 4. 手机更适合看输出、发短命令和轻控制；电脑前的重输入仍然建议在本地终端完成。
+5. 不要手动给多台电脑复用同一个 `deviceId`。新版会自动生成唯一设备名，除非你明确知道自己在做什么，不要覆盖它。
+6. `TERMPILOT_CLIENT_TOKEN` 现在默认不启用。只有你明确需要“管理端查看所有设备”时，才单独配置它。
 
 ## 本地开发
 
@@ -110,9 +113,8 @@ pnpm build
 pnpm docs:dev
 pnpm test:ui-smoke
 pnpm check:stability
+pnpm test:isolation
 ```
-10. 想排查控制历史时先看 `termpilot audit --limit 30`。
-11. 服务器上日常用 `termpilot relay` 后台运行；只有排查问题时才用 `termpilot relay run`。
 
 ## 常见坑
 
@@ -121,8 +123,10 @@ pnpm check:stability
 - 手机上看不到任务时，先确认这个任务是不是通过 `termpilot ...` 或 `termpilot create` 启动的。
 - 首次配对优先用 `termpilot agent` 拿配对码；重新给手机配对时用 `termpilot agent --pair`。
 - 外网正式使用时，不要长期直接裸奔 `ws://IP:8787/ws`，最好上域名和反代。
+- 旧版本如果还保留着 `pc-main`，新版 `termpilot agent` 会自动迁移成唯一设备名，并提示你重新配对手机。
+- 想排查控制历史时先看 `termpilot audit --limit 30`。
 
-## 本地开发
+## 更多文档
 
 更多实现说明：
 

package/dist/cli.js

@@ -7,10 +7,6 @@ import { cwd as processCwd2 } from "process";
 import { createInterface } from "readline/promises";
 import { setTimeout as delay2 } from "timers/promises";
 
-// agent/src/daemon.ts
-import { setTimeout as delay } from "timers/promises";
-import WebSocket from "ws";
-
 // packages/protocol/src/index.ts
 var DEFAULT_DEVICE_ID = "pc-main";
 var DEFAULT_AGENT_TOKEN = "demo-agent-token";
@@ -23,10 +19,14 @@ function parseJsonMessage(raw) {
   }
 }
 
+// agent/src/daemon.ts
+import { setTimeout as delay } from "timers/promises";
+import WebSocket from "ws";
+
 // agent/src/state-store.ts
 import { randomUUID } from "crypto";
 import { closeSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "fs";
-import { homedir } from "os";
+import { homedir, hostname } from "os";
 import path from "path";
 var INITIAL_STATE = {
   version: 1,
@@ -53,6 +53,9 @@ function getAgentLogFilePath() {
 function getAgentConfigFilePath() {
   return path.join(getAgentHome(), "config.json");
 }
+function getGeneratedDeviceIdFilePath() {
+  return path.join(getAgentHome(), "device-id");
+}
 function getStateLockPath() {
   return `${getStateFilePath()}.lock`;
 }
@@ -119,6 +122,42 @@ function withStateLock(action) {
     rmSync(lockPath, { force: true });
   }
 }
+function sanitizeDeviceLabel(value) {
+  return value.trim().toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+}
+function generateDeviceId() {
+  const base = sanitizeDeviceLabel(hostname().split(".")[0] ?? "") || "pc";
+  return `${base}-${randomUUID().slice(0, 8)}`;
+}
+function getOrCreateGeneratedDeviceId() {
+  ensureAgentHome();
+  const filePath = getGeneratedDeviceIdFilePath();
+  try {
+    const existing = readFileSync(filePath, "utf8").trim();
+    if (existing && existing !== DEFAULT_DEVICE_ID) {
+      return existing;
+    }
+  } catch {
+  }
+  const deviceId = generateDeviceId();
+  writeFileSync(filePath, `${deviceId}
+`, "utf8");
+  return deviceId;
+}
+function rewriteSessionsDeviceId(previousDeviceId, nextDeviceId) {
+  return withStateLock((filePath) => {
+    const state = loadStateFromDisk(filePath);
+    const nextState = {
+      version: 1,
+      sessions: state.sessions.map((session) => session.deviceId === previousDeviceId ? {
+        ...session,
+        deviceId: nextDeviceId
+      } : session)
+    };
+    saveStateToDisk(filePath, nextState);
+    return nextState;
+  });
+}
 function upsertSession(session) {
   return withStateLock((filePath) => {
     const state = loadStateFromDisk(filePath);
@@ -244,7 +283,8 @@ async function createSession(input = {}) {
   const name = input.name?.trim() || `session-${sid.slice(0, 6)}`;
   const shell = input.shell?.trim() || process.env.SHELL || "/bin/zsh";
   const workingDirectory = input.cwd?.trim() || processCwd();
-  const deviceId = input.deviceId?.trim() || process.env.TERMPILOT_DEVICE_ID || DEFAULT_DEVICE_ID;
+  const requestedDeviceId = input.deviceId?.trim() || process.env.TERMPILOT_DEVICE_ID?.trim();
+  const deviceId = requestedDeviceId && requestedDeviceId !== DEFAULT_DEVICE_ID ? requestedDeviceId : getOrCreateGeneratedDeviceId();
   const startedAt = now();
   const tmuxSessionName = buildTmuxSessionName(sid, name);
   await runTmux(["new-session", "-d", "-s", tmuxSessionName, "-c", workingDirectory, shell]);
@@ -649,8 +689,8 @@ function createDaemonFromEnv() {
 }
 
 // agent/src/relay-admin.ts
-function isLocalRelayHost(hostname) {
-  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || /^10\./.test(hostname) || /^192\.168\./.test(hostname) || /^172\.(1[6-9]|2\d|3[0-1])\./.test(hostname);
+function isLocalRelayHost(hostname2) {
+  return hostname2 === "localhost" || hostname2 === "127.0.0.1" || hostname2 === "::1" || /^10\./.test(hostname2) || /^192\.168\./.test(hostname2) || /^172\.(1[6-9]|2\d|3[0-1])\./.test(hostname2);
 }
 function getRelayBaseCandidates(relayUrl = process.env.TERMPILOT_RELAY_URL ?? "ws://127.0.0.1:8787/ws") {
   let url;
@@ -715,7 +755,11 @@ function getAgentToken() {
   return process.env.TERMPILOT_AGENT_TOKEN ?? DEFAULT_AGENT_TOKEN;
 }
 function resolveDeviceId(value) {
-  return value?.trim() || process.env.TERMPILOT_DEVICE_ID || DEFAULT_DEVICE_ID;
+  const normalized = value?.trim() || process.env.TERMPILOT_DEVICE_ID?.trim();
+  if (normalized && normalized !== DEFAULT_DEVICE_ID) {
+    return normalized;
+  }
+  return getOrCreateGeneratedDeviceId();
 }
 async function readJsonOrThrow(response, message) {
   if (!response.ok) {
@@ -905,8 +949,28 @@ function getDeviceId(argv) {
   const saved = loadAgentConfig();
   return resolveDeviceId(saved?.deviceId);
 }
-function isLocalRelayHost2(hostname) {
-  return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || /^10\./.test(hostname) || /^192\.168\./.test(hostname) || /^172\.(1[6-9]|2\d|3[0-1])\./.test(hostname);
+function maybeMigrateLegacyDeviceId(config, source) {
+  if (source === "cli" || source === "env") {
+    return { config };
+  }
+  if (config.deviceId !== DEFAULT_DEVICE_ID) {
+    return { config };
+  }
+  const nextDeviceId = getOrCreateGeneratedDeviceId();
+  if (nextDeviceId === config.deviceId) {
+    return { config };
+  }
+  rewriteSessionsDeviceId(config.deviceId, nextDeviceId);
+  return {
+    config: {
+      ...config,
+      deviceId: nextDeviceId
+    },
+    migratedFrom: config.deviceId
+  };
+}
+function isLocalRelayHost2(hostname2) {
+  return hostname2 === "localhost" || hostname2 === "127.0.0.1" || hostname2 === "::1" || /^10\./.test(hostname2) || /^192\.168\./.test(hostname2) || /^172\.(1[6-9]|2\d|3[0-1])\./.test(hostname2);
 }
 function normalizeRelayUrl(rawHost, rawPort) {
   const hostInput = rawHost.trim();
@@ -1004,7 +1068,11 @@ function getResolvedConfig(argv) {
 async function ensureConfigured(argv) {
   const resolved = getResolvedConfig(argv);
   if (resolved) {
-    return resolved;
+    const migrated = maybeMigrateLegacyDeviceId(resolved.config, resolved.source);
+    if (migrated.migratedFrom) {
+      saveAgentConfig(migrated.config);
+    }
+    return { config: migrated.config, source: resolved.source };
   }
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
     throw new Error(`\u8FD8\u6CA1\u6709\u914D\u7F6E relay\uFF0C\u8BF7\u5148\u6267\u884C\uFF1Atermpilot agent --relay wss://\u4F60\u7684\u57DF\u540D/ws\uFF0C\u6216\u5728\u4EA4\u4E92\u7EC8\u7AEF\u91CC\u76F4\u63A5\u8FD0\u884C termpilot agent\u3002`);
@@ -1104,6 +1172,8 @@ async function runStart(argv) {
   const resolved = await ensureConfigured(argv);
   let { config } = resolved;
   const { source } = resolved;
+  const previousConfig = loadAgentConfig();
+  const migratedDeviceId = previousConfig?.deviceId === DEFAULT_DEVICE_ID && config.deviceId !== previousConfig.deviceId ? previousConfig.deviceId : void 0;
   const preferredRelayUrl = await resolvePreferredRelayUrl(config.relayUrl);
   if (preferredRelayUrl !== config.relayUrl) {
     config = {
@@ -1116,6 +1186,10 @@ async function runStart(argv) {
   if (source === "cli" || source === "prompt" || source === "saved") {
     saveAgentConfig(config);
   }
+  if (migratedDeviceId) {
+    console.log(`\u68C0\u6D4B\u5230\u65E7\u7684\u5171\u4EAB\u8BBE\u5907\u540D ${migratedDeviceId}\uFF0C\u5DF2\u81EA\u52A8\u8FC1\u79FB\u4E3A\u552F\u4E00\u8BBE\u5907\u540D ${config.deviceId}\u3002`);
+    console.log("\u8FD9\u662F\u4E00\u6B21\u5B89\u5168\u4FEE\u590D\uFF1A\u5171\u4EAB relay \u4E0A\u4E0D\u540C\u7535\u8111\u4E0D\u80FD\u7EE7\u7EED\u5171\u7528 pc-main\u3002\u8BF7\u91CD\u65B0\u7ED9\u624B\u673A\u914D\u5BF9\u3002");
+  }
   if (args.foreground) {
     await runDaemon();
     return;
@@ -1407,11 +1481,13 @@ import { setTimeout as delay3 } from "timers/promises";
 
 // relay/src/config.ts
 function loadConfig() {
+  const rawClientToken = process.env.TERMPILOT_CLIENT_TOKEN?.trim();
+  const clientToken = rawClientToken && rawClientToken !== DEFAULT_CLIENT_TOKEN ? rawClientToken : void 0;
   return {
     host: process.env.HOST ?? "0.0.0.0",
     port: Number(process.env.PORT ?? 8787),
     agentToken: process.env.TERMPILOT_AGENT_TOKEN ?? DEFAULT_AGENT_TOKEN,
-    clientToken: process.env.TERMPILOT_CLIENT_TOKEN ?? DEFAULT_CLIENT_TOKEN,
+    clientToken,
     databaseUrl: process.env.DATABASE_URL?.trim() || void 0,
     pairingTtlMinutes: Number(process.env.TERMPILOT_PAIRING_TTL_MINUTES ?? 10)
   };
@@ -1990,6 +2066,9 @@ async function startRelayServer(options = {}) {
   const sessionCache = /* @__PURE__ */ new Map();
   const outputBuffers = /* @__PURE__ */ new Map();
   const webDir = options.webDir ?? resolveDefaultWebDir(import.meta.url);
+  if ((process.env.TERMPILOT_CLIENT_TOKEN ?? "").trim() === DEFAULT_CLIENT_TOKEN) {
+    app.log.warn("\u68C0\u6D4B\u5230 TERMPILOT_CLIENT_TOKEN \u4ECD\u4E3A\u9ED8\u8BA4 demo-client-token\u3002\u51FA\u4E8E\u9694\u79BB\u5B89\u5168\u8003\u8651\uFF0Crelay \u5DF2\u81EA\u52A8\u7981\u7528\u5168\u5C40\u5BA2\u6237\u7AEF\u8BBF\u95EE\u4EE4\u724C\u3002");
+  }
   const storesPromise = (async () => {
     if (!config.databaseUrl) {
       app.log.warn("\u672A\u63D0\u4F9B DATABASE_URL\uFF0C\u5F53\u524D relay \u4F7F\u7528\u5185\u5B58\u5B58\u50A8\u4F1A\u8BDD\u5143\u6570\u636E\u3002");
@@ -2232,7 +2311,8 @@ async function startRelayServer(options = {}) {
       storeMode: sessionStore.mode,
       agentsOnline: agents.size,
       clientsOnline: clients.size,
-      webUiReady: existsSync(webDir)
+      webUiReady: existsSync(webDir),
+      adminClientTokenEnabled: Boolean(config.clientToken)
     };
   });
   app.post("/api/pairing-codes", async (request, reply) => {
@@ -2380,7 +2460,7 @@ async function startRelayServer(options = {}) {
     if (role === "client") {
       void (async () => {
         let client = null;
-        if (token === config.clientToken) {
+        if (config.clientToken && token === config.clientToken) {
           client = {
             socket,
             deviceScope: "*"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fengye404/termpilot",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "type": "module",
   "packageManager": "pnpm@10.31.0",
   "description": "一个基于 tmux 的终端会话跨端查看与控制原型。",
@@ -41,6 +41,7 @@
     "agent:revoke": "pnpm --filter @termpilot/agent run revoke",
     "agent:doctor": "pnpm --filter @termpilot/agent run doctor",
     "check:stability": "pnpm build && node scripts/check-relay-agent-stability.mjs",
+    "test:isolation": "pnpm build && node scripts/check-device-isolation.mjs",
     "test:ui-smoke": "pnpm build && TERMPILOT_APP_URL=http://127.0.0.1:18787 TERMPILOT_RELAY_URL=ws://127.0.0.1:18787/ws python3 /Users/fengye/.agents/skills/webapp-testing/scripts/with_server.py --server \"PORT=18787 node dist/cli.js relay\" --port 18787 -- python3 scripts/ui_smoke.py",
     "prepack": "pnpm build"
   },