@rethinkingstudio/clawpilot 1.1.10 → 1.1.11

package/src/commands/install.ts

@@ -1,135 +1,97 @@
-import { writeFileSync, mkdirSync, existsSync, unlinkSync } from "fs";
+import { existsSync, unlinkSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
-import { execSync } from "child_process";
 import { t } from "../i18n/index.js";
-
-const PLIST_LABEL     = "com.rethinkingstudio.clawpilot";
-const PLIST_LABEL_OLD = "com.rethinkingstudio.clawai";   // legacy, cleaned up by stop
-const LAUNCH_AGENTS_DIR = join(homedir(), "Library", "LaunchAgents");
-const PLIST_PATH     = join(LAUNCH_AGENTS_DIR, `${PLIST_LABEL}.plist`);
-const PLIST_PATH_OLD = join(LAUNCH_AGENTS_DIR, `${PLIST_LABEL_OLD}.plist`);
+import {
+  getServicePlatform,
+  getServiceStatus,
+  installService,
+  restartService,
+  stopService,
+  uninstallService,
+  servicePaths,
+} from "../platform/service-manager.js";
 
 export function isInstalled(): boolean {
-  return existsSync(PLIST_PATH);
+  const platform = getServicePlatform();
+  if (platform === "macos") return existsSync(servicePaths.macPlistPath);
+  if (platform === "linux") {
+    return existsSync(servicePaths.linuxServicePath) || existsSync(servicePaths.linuxNohupStartScriptPath);
+  }
+  return false;
 }
 
 export function installCommand(): void {
-  const nodeBin = process.execPath;
-  const scriptPath = process.argv[1];
-
-  // Bundled binary (pkg): execPath === argv[1], use it directly.
-  // Node script: need both node binary and script path.
-  const programArgs = nodeBin === scriptPath
-    ? [scriptPath, "run"]
-    : [nodeBin, scriptPath, "run"];
-
-  const argsXml = programArgs.map(a => `    <string>${a}</string>`).join("\n");
-
-  const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-  "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>${PLIST_LABEL}</string>
-  <key>ProgramArguments</key>
-  <array>
-${argsXml}
-  </array>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <true/>
-  <key>StandardOutPath</key>
-  <string>${join(homedir(), ".clawai", "clawpilot.log")}</string>
-  <key>StandardErrorPath</key>
-  <string>${join(homedir(), ".clawai", "clawpilot-error.log")}</string>
-</dict>
-</plist>`;
-
-  mkdirSync(LAUNCH_AGENTS_DIR, { recursive: true });
-  mkdirSync(join(homedir(), ".clawai"), { recursive: true });
-
-  // Unload existing service first (ignore errors if not loaded)
-  try {
-    execSync(`launchctl unload -w "${PLIST_PATH}"`, { stdio: "pipe" });
-  } catch { /* not loaded, that's fine */ }
+  const platform = getServicePlatform();
+  if (platform === "unsupported") {
+    console.log(t("install.unsupported", process.platform));
+    console.log(t("install.runForeground"));
+    return;
+  }
 
-  writeFileSync(PLIST_PATH, plistContent, "utf-8");
+  const started = installService();
+  if (started) {
+    const service = getServiceStatus();
+    console.log(t("install.serviceStarted", service.manager));
+    return;
+  }
 
-  try {
-    execSync(`launchctl load -w "${PLIST_PATH}"`, { stdio: "inherit" });
-    console.log(t("install.serviceStarted", PLIST_LABEL));
-  } catch (err) {
-    console.error(t("install.loadFailed"), err);
-    console.log(t("install.plistWritten", PLIST_PATH));
-    console.log(t("install.loadManually", PLIST_PATH));
+  console.log(t("install.installFailed", platformName(platform)));
+  if (platform === "macos") {
+    console.log(t("install.serviceFileWritten", servicePaths.macPlistPath));
+    console.log(t("install.startManually", `launchctl load -w "${servicePaths.macPlistPath}"`));
+  } else if (platform === "linux") {
+    console.log(t("install.serviceFileWritten", servicePaths.linuxServicePath));
+    console.log(t("install.startManually", "systemctl --user daemon-reload && systemctl --user enable --now clawpilot.service"));
+    console.log(t("install.startManually", `bash "${servicePaths.linuxNohupStartScriptPath}"`));
   }
 }
 
 export function restartCommand(): void {
   console.log(t("install.restarting"));
-  installCommand();
+  const platform = getServicePlatform();
+  if (platform === "unsupported") {
+    console.log(t("install.unsupported", process.platform));
+    return;
+  }
+  if (restartService()) {
+    console.log(t("install.serviceRestarted", platformName(platform)));
+    return;
+  }
+  console.log(t("install.restartFailed", platformName(platform)));
 }
 
 export function uninstallCommand(): void {
-  try {
-    execSync(`launchctl unload -w "${PLIST_PATH}"`, { stdio: "inherit" });
-    console.log(t("install.serviceStopped", PLIST_LABEL));
-  } catch {
-    // May fail if not loaded
+  const platform = getServicePlatform();
+  if (platform === "unsupported") {
+    console.log(t("install.unsupported", process.platform));
+    return;
   }
-
-  try {
-    execSync(`rm -f "${PLIST_PATH}"`, { stdio: "inherit" });
-    console.log(t("install.plistRemoved", PLIST_PATH));
-  } catch (err) {
-    console.error(t("install.removePlistFailed"), err);
+  const changed = uninstallService();
+  if (changed) {
+    console.log(t("install.stoppedAndRemoved", platformName(platform)));
+  } else {
+    console.log(t("install.noService"));
   }
 }
 
-/** Stop relay client and remove from launchd (also cleans up legacy clawai service). */
 export function stopCommand(): void {
-  let stopped = false;
-
-  // Stop + remove new label
-  try {
-    execSync(`launchctl unload -w "${PLIST_PATH}"`, { stdio: "pipe" });
-    console.log(t("install.stopped", PLIST_LABEL));
-    stopped = true;
-  } catch {
-    // Not loaded — that's fine
-  }
-  try {
-    execSync(`rm -f "${PLIST_PATH}"`, { stdio: "pipe" });
-  } catch { /* ignore */ }
-
-  // Stop + remove legacy clawai label
-  try {
-    execSync(`launchctl unload -w "${PLIST_PATH_OLD}"`, { stdio: "pipe" });
-    console.log(t("install.stopped", PLIST_LABEL_OLD));
-    stopped = true;
-  } catch {
-    // Not loaded — that's fine
+  const platform = getServicePlatform();
+  if (platform === "unsupported") {
+    console.log(t("install.unsupported", process.platform));
+    return;
   }
-  try {
-    execSync(`rm -f "${PLIST_PATH_OLD}"`, { stdio: "pipe" });
-  } catch { /* ignore */ }
-
-  if (stopped) {
-    console.log(t("install.stoppedAndRemoved"));
+  const changed = stopService();
+  if (changed) {
+    console.log(t("install.stopped", platformName(platform)));
   } else {
     console.log(t("install.noService"));
   }
 }
 
-/** Clear saved config and stop the service — use this when switching servers or on auth errors. */
 export function resetCommand(): void {
-  // Stop the service first
   stopCommand();
 
-  // Remove config file
   const configPath = join(homedir(), ".clawai", "config.json");
   if (existsSync(configPath)) {
     try {
@@ -144,3 +106,14 @@ export function resetCommand(): void {
 
   console.log(t("install.resetComplete"));
 }
+
+function platformName(platform: ReturnType<typeof getServicePlatform>): string {
+  switch (platform) {
+    case "macos":
+      return "launchd";
+    case "linux":
+      return "systemd/nohup";
+    default:
+      return process.platform;
+  }
+}

package/src/commands/pair.ts

@@ -1,5 +1,6 @@
 import { hostname } from "os";
 import { execSync } from "child_process";
+import { getServicePlatform } from "../platform/service-manager.js";
 
 function sanitizeDisplayName(name: string): string {
   // Replace smart quotes and other problematic characters with regular ones
@@ -11,6 +12,9 @@ function sanitizeDisplayName(name: string): string {
 }
 
 function getDisplayName(): string {
+  if (getServicePlatform() !== "macos") {
+    return hostname();
+  }
   try {
     const raw = execSync("scutil --get ComputerName", { encoding: "utf8" }).trim();
     return sanitizeDisplayName(raw);
@@ -28,6 +32,7 @@ const DEFAULT_RELAY_SERVER = "https://clawpilot.codeaddict.cn";
 interface PairOptions {
   server?: string;
   name?: string;
+  codeOnly?: boolean;
 }
 
 export async function pairCommand(opts: PairOptions): Promise<void> {
@@ -103,9 +108,13 @@ export async function pairCommand(opts: PairOptions): Promise<void> {
     displayName,
   });
 
-  console.log(t("pair.scanQR"));
-  qrcodeTerminal.generate(qrPayload, { small: true });
-  console.log(t("pair.accessCode", accessCode));
+  if (opts.codeOnly) {
+    console.log(accessCode);
+  } else {
+    console.log(t("pair.scanQR"));
+    qrcodeTerminal.generate(qrPayload, { small: true });
+    console.log(t("pair.accessCode", accessCode));
+  }
 
   console.log(t("pair.installingService"));
   installCommand();

package/src/commands/status.ts

@@ -1,27 +1,10 @@
-import { existsSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
-import { execSync } from "child_process";
 import { configExists, readConfig, readGatewayUrl } from "../config/config.js";
 import { t } from "../i18n/index.js";
-
-const PLIST_LABEL = "com.rethinkingstudio.clawpilot";
-const PLIST_PATH = join(homedir(), "Library", "LaunchAgents", `${PLIST_LABEL}.plist`);
-const LOG_PATH   = join(homedir(), ".clawai", "clawpilot.log");
-
-function isServiceRunning(): boolean {
-  try {
-    execSync(`launchctl list ${PLIST_LABEL}`, { stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
-  }
-}
+import { getServiceStatus } from "../platform/service-manager.js";
 
 export function statusCommand(): void {
   console.log(t("status.title"));
 
-  // Pairing config
   if (!configExists()) {
     console.log(t("status.notPaired"));
   } else {
@@ -36,23 +19,30 @@ export function statusCommand(): void {
     }
   }
 
-  // Local gateway
-  const gatewayUrl = readGatewayUrl();
-  console.log(t("status.gateway", gatewayUrl));
+  console.log(t("status.gateway", readGatewayUrl()));
 
-  // launchd service
-  const plistExists = existsSync(PLIST_PATH);
-  const running = isServiceRunning();
+  const service = getServiceStatus();
+  if (service.platform === "unsupported") {
+    console.log(t("status.serviceUnsupported", process.platform));
+    console.log("");
+    return;
+  }
+
+  console.log(t("status.servicePlatform", service.manager));
 
-  if (!plistExists) {
+  if (!service.installed) {
     console.log(t("status.serviceNotInstalled"));
-  } else if (running) {
-    console.log(t("status.serviceRunning"));
-    console.log(t("status.serviceLog", LOG_PATH));
+  } else if (service.running) {
+    console.log(t("status.serviceRunning", service.manager));
+    console.log(t("status.serviceLog", service.logPath));
   } else {
     console.log(t("status.serviceNotRunning"));
-    console.log(t("status.servicePlist", PLIST_PATH));
-    console.log(t("status.serviceStart", PLIST_LABEL));
+    if (service.servicePath) {
+      console.log(t("status.serviceFile", service.servicePath));
+    }
+    if (service.startHint) {
+      console.log(t("status.serviceStart", service.startHint));
+    }
   }
 
   console.log("");

package/src/i18n/index.ts

@@ -24,17 +24,18 @@ const en: Record<string, MsgValue> = {
   "run.retry": (attempt, delay) => `Retry attempt ${attempt}, waiting ${delay}ms…`,
 
   // install
-  "install.serviceStarted": (label) => `Service installed and started: ${label}`,
-  "install.loadFailed": "Failed to load launchd service:",
-  "install.plistWritten": (path) => `Plist written to: ${path}`,
-  "install.loadManually": (path) => `Run manually: launchctl load -w "${path}"`,
+  "install.serviceStarted": (manager) => `Service installed and started via ${manager}.`,
+  "install.installFailed": (manager) => `Failed to activate service via ${manager}.`,
+  "install.serviceFileWritten": (path) => `Service file written to: ${path}`,
+  "install.startManually": (command) => `Start manually: ${command}`,
   "install.restarting": "Restarting relay service…",
-  "install.serviceStopped": (label) => `Service stopped: ${label}`,
-  "install.removePlistFailed": "Failed to remove plist:",
-  "install.plistRemoved": (path) => `Plist removed: ${path}`,
-  "install.stopped": (label) => `Stopped: ${label}`,
-  "install.stoppedAndRemoved": "Relay client stopped and removed from launchd.",
+  "install.serviceRestarted": (manager) => `Service restarted via ${manager}.`,
+  "install.restartFailed": (manager) => `Failed to restart service via ${manager}.`,
+  "install.stopped": (manager) => `Relay client stopped via ${manager}.`,
+  "install.stoppedAndRemoved": (manager) => `Relay client stopped and removed from ${manager}.`,
   "install.noService": "No running relay service found.",
+  "install.unsupported": (platform) => `Background service management is not supported on platform: ${platform}`,
+  "install.runForeground": "Run `clawpilot run` manually in the foreground instead.",
   "install.configRemoved": (path) => `Config removed: ${path}`,
   "install.removeConfigFailed": "Failed to remove config:",
   "install.noConfig": "No config file found.",
@@ -49,12 +50,14 @@ const en: Record<string, MsgValue> = {
   "status.relayServer": (url) => `  Relay server : ${url}`,
   "status.configCorrupted": "Config:   ✗  File exists but is corrupted",
   "status.gateway": (url) => `\nGateway:  ${url}`,
+  "status.servicePlatform": (manager) => `\nService Manager: ${manager}`,
   "status.serviceNotInstalled": "\nService:  ✗  Not installed — run 'clawpilot install'",
-  "status.serviceRunning": "\nService:  ✓  Running (launchd)",
+  "status.serviceRunning": (manager) => `\nService:  ✓  Running (${manager})`,
   "status.serviceLog": (path) => `  Log : ${path}`,
   "status.serviceNotRunning": "\nService:  ⚠  Installed but not running",
-  "status.servicePlist": (path) => `  Plist : ${path}`,
-  "status.serviceStart": (label) => `  Start : launchctl start ${label}`,
+  "status.serviceFile": (path) => `  Service file : ${path}`,
+  "status.serviceStart": (command) => `  Start : ${command}`,
+  "status.serviceUnsupported": (platform) => `\nService:  -  Unsupported on platform ${platform}`,
 
   // set-token
   "setToken.noPairing": "No pairing config found. Run 'clawpilot pair' first.",
@@ -91,17 +94,18 @@ const zh: Record<string, MsgValue> = {
   "run.retry": (attempt, delay) => `第 ${attempt} 次重试，等待 ${delay}ms…`,
 
   // install
-  "install.serviceStarted": (label) => `服务已安装并启动：${label}`,
-  "install.loadFailed": "加载 launchd 服务失败：",
-  "install.plistWritten": (path) => `Plist 已写入：${path}`,
-  "install.loadManually": (path) => `请手动运行：launchctl load -w "${path}"`,
+  "install.serviceStarted": (manager) => `服务已通过 ${manager} 安装并启动。`,
+  "install.installFailed": (manager) => `通过 ${manager} 启动服务失败。`,
+  "install.serviceFileWritten": (path) => `服务文件已写入：${path}`,
+  "install.startManually": (command) => `请手动运行：${command}`,
   "install.restarting": "正在重启中继服务…",
-  "install.serviceStopped": (label) => `服务已停止：${label}`,
-  "install.removePlistFailed": "删除 Plist 失败：",
-  "install.plistRemoved": (path) => `Plist 已删除：${path}`,
-  "install.stopped": (label) => `已停止：${label}`,
-  "install.stoppedAndRemoved": "中继客户端已停止并从 launchd 移除。",
+  "install.serviceRestarted": (manager) => `服务已通过 ${manager} 重启。`,
+  "install.restartFailed": (manager) => `通过 ${manager} 重启服务失败。`,
+  "install.stopped": (manager) => `已通过 ${manager} 停止中继客户端。`,
+  "install.stoppedAndRemoved": (manager) => `中继客户端已停止并从 ${manager} 移除。`,
   "install.noService": "未找到正在运行的中继服务。",
+  "install.unsupported": (platform) => `当前平台 ${platform} 暂不支持后台服务管理`,
+  "install.runForeground": "请改用 `clawpilot run` 前台运行。",
   "install.configRemoved": (path) => `配置文件已删除：${path}`,
   "install.removeConfigFailed": "删除配置文件失败：",
   "install.noConfig": "未找到配置文件。",
@@ -116,12 +120,14 @@ const zh: Record<string, MsgValue> = {
   "status.relayServer": (url) => `  中继服务器：${url}`,
   "status.configCorrupted": "配置：✗  文件存在但已损坏",
   "status.gateway": (url) => `\n网关地址：${url}`,
+  "status.servicePlatform": (manager) => `\n服务管理器：${manager}`,
   "status.serviceNotInstalled": "\n服务：✗  未安装 — 请运行 'clawpilot install'",
-  "status.serviceRunning": "\n服务：✓  运行中 (launchd)",
+  "status.serviceRunning": (manager) => `\n服务：✓  运行中 (${manager})`,
   "status.serviceLog": (path) => `  日志：${path}`,
   "status.serviceNotRunning": "\n服务：⚠  已安装但未运行",
-  "status.servicePlist": (path) => `  Plist：${path}`,
-  "status.serviceStart": (label) => `  启动命令：launchctl start ${label}`,
+  "status.serviceFile": (path) => `  服务文件：${path}`,
+  "status.serviceStart": (command) => `  启动命令：${command}`,
+  "status.serviceUnsupported": (platform) => `\n服务：-  平台 ${platform} 暂不支持`,
 
   // set-token
   "setToken.noPairing": "未找到配对配置，请先运行 'clawpilot pair'。",

package/src/index.ts

@@ -14,15 +14,16 @@ const program = new Command();
 
 program
   .name("clawpilot")
-  .description("ClawPilot relay client — connects Mac mini to the cloud relay server")
+  .description("ClawPilot relay client — connects OpenClaw gateway hosts to the cloud relay server")
   .version(version);
 
 program
   .command("pair")
   .description("Register with relay server and display QR code for iOS pairing")
   .option("-s, --server <url>", "Relay server URL", "https://clawpilot.codeaddict.cn")
-  .option("-n, --name <name>", "Display name for this Mac")
-  .action(async (opts: { server: string; name: string }) => {
+  .option("-n, --name <name>", "Display name for this host")
+  .option("--code-only", "Print only the access code and skip QR code output", false)
+  .action(async (opts: { server: string; name: string; codeOnly?: boolean }) => {
     try {
       await pairCommand(opts);
     } catch (err) {
@@ -33,7 +34,7 @@ program
 
 program
   .command("run")
-  .description("Run relay client in foreground (used by launchd service — use 'install' instead)")
+  .description("Run relay client in foreground (used by the background service manager)")
   .action(async () => {
     try {
       await runCommand();
@@ -45,35 +46,35 @@ program
 
 program
   .command("stop")
-  .description("Stop relay client and remove launchd service")
+  .description("Stop relay client background service")
   .action(() => {
     stopCommand();
   });
 
 program
   .command("status")
-  .description("Show pairing config, gateway URL, and launchd service status")
+  .description("Show pairing config, gateway URL, and background service status")
   .action(() => {
     statusCommand();
   });
 
 program
   .command("install")
-  .description("Register as a launchd service (auto-start on login)")
+  .description("Register as a background service (launchd on macOS, systemd --user on Linux)")
   .action(() => {
     installCommand();
   });
 
 program
   .command("restart")
-  .description("Restart the relay launchd service")
+  .description("Restart the relay background service")
   .action(() => {
     restartCommand();
   });
 
 program
   .command("uninstall")
-  .description("Remove launchd service")
+  .description("Remove background service")
   .action(() => {
     uninstallCommand();
   });
@@ -98,4 +99,3 @@ program
   });
 
 program.parse(process.argv);
-