@rethinkingstudio/clawpilot 1.0.9 → 1.0.11

package/src/config/config.ts

@@ -46,8 +46,10 @@ export function readGatewayUrl(): string {
 }
 
 /**
- * Reads the gateway token or password from the clawai config first,
- * then falls back to reading directly from the OpenClaw config file.
+ * Reads the gateway token or password. Priority order:
+ * 1. ~/.clawai/config.json (gatewayToken / gatewayPassword)
+ * 2. ~/.openclaw/openclaw.json (gateway.token / gateway.auth.token)
+ * 3. Environment variables (OPENCLAW_GATEWAY_TOKEN / OPENCLAW_GATEWAY_PASSWORD)
  */
 export function readGatewayAuth(cfg: ClawaiConfig): { token?: string; password?: string } {
   if (cfg.gatewayToken || cfg.gatewayPassword) {
@@ -57,11 +59,17 @@ export function readGatewayAuth(cfg: ClawaiConfig): { token?: string; password?:
   try {
     const raw = readFileSync(OPENCLAW_CONFIG_PATH, "utf-8");
     const json = JSON.parse(raw) as { gateway?: { token?: string; password?: string; auth?: { token?: string; password?: string } } };
-    return {
-      token: json?.gateway?.token ?? json?.gateway?.auth?.token ?? undefined,
-      password: json?.gateway?.password ?? json?.gateway?.auth?.password ?? undefined,
-    };
+    const token = json?.gateway?.token ?? json?.gateway?.auth?.token ?? undefined;
+    const password = json?.gateway?.password ?? json?.gateway?.auth?.password ?? undefined;
+    if (token || password) return { token, password };
   } catch {
-    return {};
+    // ignore
   }
+  // Fall back to environment variables (e.g. set via LaunchAgent)
+  const envToken = process.env.OPENCLAW_GATEWAY_TOKEN;
+  const envPassword = process.env.OPENCLAW_GATEWAY_PASSWORD;
+  if (envToken || envPassword) {
+    return { token: envToken, password: envPassword };
+  }
+  return {};
 }

package/src/i18n/index.ts

@@ -0,0 +1,151 @@
+type Locale = "en" | "zh";
+type MsgFn = (...args: string[]) => string;
+type MsgValue = string | MsgFn;
+
+const en: Record<string, MsgValue> = {
+  // pair
+  "pair.alreadyRegistered": (id) => `Gateway already registered (id=${id}). Refreshing access code…`,
+  "pair.invalidCredentials": "Invalid credentials (401). The server doesn't recognize this gateway.\nRun `clawpilot reset` to clear config and re-register.",
+  "pair.refreshFailed": (status, body) => `Failed to refresh access code: ${status} ${body}`,
+  "pair.registering": "Registering with relay server…",
+  "pair.registrationFailed": (status, body) => `Registration failed: ${status} ${body}`,
+  "pair.registered": (id) => `Registered! Gateway ID: ${id}`,
+  "pair.scanQR": "\nScan this QR code with the Clawai iOS app:\n",
+  "pair.accessCode": (code) => `\nAccess code (one-time use): ${code}`,
+  "pair.installingService": "\nInstalling/updating relay background service…",
+
+  // run
+  "run.starting": "Starting ClawAI relay client…",
+  "run.gatewayId": (id) => `  Gateway ID:   ${id}`,
+  "run.relayServer": (url) => `  Relay Server: ${url}`,
+  "run.gatewayUrl": (url) => `  Gateway URL:  ${url}`,
+  "run.connected": "Relay connected.",
+  "run.disconnected": "Relay disconnected. Reconnecting…",
+  "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.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.noService": "No running relay service found.",
+  "install.configRemoved": (path) => `Config removed: ${path}`,
+  "install.removeConfigFailed": "Failed to remove config:",
+  "install.noConfig": "No config file found.",
+  "install.resetComplete": "\nReset complete. Run `clawpilot pair` to re-register.",
+
+  // status
+  "status.title": "── ClawPilot Relay Client Status ──\n",
+  "status.notPaired": "Config:   ✗  Not paired — run 'clawpilot pair' first",
+  "status.paired": "Config:   ✓  Paired",
+  "status.displayName": (name) => `  Display name : ${name}`,
+  "status.gatewayId": (id) => `  Gateway ID   : ${id}`,
+  "status.relayServer": (url) => `  Relay server : ${url}`,
+  "status.configCorrupted": "Config:   ✗  File exists but is corrupted",
+  "status.gateway": (url) => `\nGateway:  ${url}`,
+  "status.serviceNotInstalled": "\nService:  ✗  Not installed — run 'clawpilot install'",
+  "status.serviceRunning": "\nService:  ✓  Running (launchd)",
+  "status.serviceLog": (path) => `  Log : ${path}`,
+  "status.serviceNotRunning": "\nService:  ⚠  Installed but not running",
+  "status.servicePlist": (path) => `  Plist : ${path}`,
+  "status.serviceStart": (label) => `  Start : launchctl start ${label}`,
+
+  // set-token
+  "setToken.noPairing": "No pairing config found. Run 'clawpilot pair' first.",
+  "setToken.whereToFind": "\nWhere to find your Gateway Token:",
+  "setToken.option1": "  Option 1 — OpenClaw desktop app: Settings → Advanced → Gateway Token",
+  "setToken.option2": "  Option 2 — Terminal:",
+  "setToken.option2cmd": "    cat ~/.openclaw/openclaw.json | grep -A2 'auth'",
+  "setToken.option3": "  Option 3 — If set via environment variable: echo $OPENCLAW_GATEWAY_TOKEN\n",
+  "setToken.prompt": "Gateway Token (leave blank to clear): ",
+  "setToken.saved": "\nToken saved to ~/.clawai/config.json.",
+  "setToken.cleared": "\nToken cleared from ~/.clawai/config.json.",
+  "setToken.restart": "Run 'clawpilot restart' to apply the change.\n",
+};
+
+const zh: Record<string, MsgValue> = {
+  // pair
+  "pair.alreadyRegistered": (id) => `网关已注册 (id=${id})，正在刷新访问码…`,
+  "pair.invalidCredentials": "凭证无效 (401)，服务器无法识别此网关。\n请运行 `clawpilot reset` 清除配置后重新注册。",
+  "pair.refreshFailed": (status, body) => `刷新访问码失败：${status} ${body}`,
+  "pair.registering": "正在向中继服务器注册…",
+  "pair.registrationFailed": (status, body) => `注册失败：${status} ${body}`,
+  "pair.registered": (id) => `注册成功！网关 ID：${id}`,
+  "pair.scanQR": "\n请用 Clawai iOS 应用扫描此二维码：\n",
+  "pair.accessCode": (code) => `\n访问码（一次性使用）：${code}`,
+  "pair.installingService": "\n正在安装/更新中继后台服务…",
+
+  // run
+  "run.starting": "正在启动 ClawAI 中继客户端…",
+  "run.gatewayId": (id) => `  网关 ID：    ${id}`,
+  "run.relayServer": (url) => `  中继服务器：${url}`,
+  "run.gatewayUrl": (url) => `  网关地址：  ${url}`,
+  "run.connected": "中继已连接。",
+  "run.disconnected": "中继已断开，正在重连…",
+  "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.restarting": "正在重启中继服务…",
+  "install.serviceStopped": (label) => `服务已停止：${label}`,
+  "install.removePlistFailed": "删除 Plist 失败：",
+  "install.plistRemoved": (path) => `Plist 已删除：${path}`,
+  "install.stopped": (label) => `已停止：${label}`,
+  "install.stoppedAndRemoved": "中继客户端已停止并从 launchd 移除。",
+  "install.noService": "未找到正在运行的中继服务。",
+  "install.configRemoved": (path) => `配置文件已删除：${path}`,
+  "install.removeConfigFailed": "删除配置文件失败：",
+  "install.noConfig": "未找到配置文件。",
+  "install.resetComplete": "\n重置完成。请运行 `clawpilot pair` 重新注册。",
+
+  // status
+  "status.title": "── ClawPilot 中继客户端状态 ──\n",
+  "status.notPaired": "配置：✗  未配对 — 请先运行 'clawpilot pair'",
+  "status.paired": "配置：✓  已配对",
+  "status.displayName": (name) => `  显示名称：${name}`,
+  "status.gatewayId": (id) => `  网关 ID：  ${id}`,
+  "status.relayServer": (url) => `  中继服务器：${url}`,
+  "status.configCorrupted": "配置：✗  文件存在但已损坏",
+  "status.gateway": (url) => `\n网关地址：${url}`,
+  "status.serviceNotInstalled": "\n服务：✗  未安装 — 请运行 'clawpilot install'",
+  "status.serviceRunning": "\n服务：✓  运行中 (launchd)",
+  "status.serviceLog": (path) => `  日志：${path}`,
+  "status.serviceNotRunning": "\n服务：⚠  已安装但未运行",
+  "status.servicePlist": (path) => `  Plist：${path}`,
+  "status.serviceStart": (label) => `  启动命令：launchctl start ${label}`,
+
+  // set-token
+  "setToken.noPairing": "未找到配对配置，请先运行 'clawpilot pair'。",
+  "setToken.whereToFind": "\n如何查找 Gateway Token：",
+  "setToken.option1": "  方式一 — OpenClaw 桌面应用：设置 → 高级 → Gateway Token",
+  "setToken.option2": "  方式二 — 终端：",
+  "setToken.option2cmd": "    cat ~/.openclaw/openclaw.json | grep -A2 'auth'",
+  "setToken.option3": "  方式三 — 若通过环境变量设置：echo $OPENCLAW_GATEWAY_TOKEN\n",
+  "setToken.prompt": "Gateway Token（留空则清除）：",
+  "setToken.saved": "\nToken 已保存到 ~/.clawai/config.json。",
+  "setToken.cleared": "\nToken 已从 ~/.clawai/config.json 清除。",
+  "setToken.restart": "请运行 'clawpilot restart' 使修改生效。\n",
+};
+
+function detectLocale(): Locale {
+  const lang = process.env.LANG ?? process.env.LC_ALL ?? process.env.LANGUAGE ?? "";
+  return lang.toLowerCase().startsWith("zh") ? "zh" : "en";
+}
+
+const locale: Locale = detectLocale();
+const msgs = locale === "zh" ? zh : en;
+
+export function t(key: string, ...args: string[]): string {
+  const val = msgs[key] ?? en[key] ?? key;
+  if (typeof val === "function") return (val as MsgFn)(...args);
+  return val as string;
+}

package/src/index.ts

@@ -4,8 +4,9 @@ import { pairCommand } from "./commands/pair.js";
 import { runCommand } from "./commands/run.js";
 import { installCommand, uninstallCommand, stopCommand, restartCommand, resetCommand } from "./commands/install.js";
 import { statusCommand } from "./commands/status.js";
+import { setTokenCommand } from "./commands/set-token.js";
 
-const version = "1.0.9";
+const version = "1.0.11";
 
 const program = new Command();
 
@@ -75,6 +76,18 @@ program
     uninstallCommand();
   });
 
+program
+  .command("set-token")
+  .description("Set the local OpenClaw gateway token (needed when using token auth)")
+  .action(async () => {
+    try {
+      await setTokenCommand();
+    } catch (err) {
+      console.error("Error:", err instanceof Error ? err.message : err);
+      process.exit(1);
+    }
+  });
+
 program
   .command("reset")
   .description("Clear saved config and stop service — use when switching servers or on auth errors")