@rethinkingstudio/clawpilot 2.0.0-beta.0 → 2.0.0-beta.1

package/src/commands/openclaw-cli.ts

@@ -1,354 +0,0 @@
-import {
-  execFileSync,
-  execSync,
-  type ExecSyncOptionsWithStringEncoding,
-} from "child_process";
-import { existsSync } from "fs";
-import { delimiter, dirname, join } from "path";
-import { homedir } from "os";
-
-const HOME_DIR = homedir();
-const NODE_BIN_DIR = dirname(process.execPath);
-const IS_WINDOWS = process.platform === "win32";
-const OPENCLAW_CANDIDATE_NAMES = IS_WINDOWS
-  ? ["openclaw.exe", "openclaw.cmd", "openclaw"]
-  : ["openclaw"];
-const KNOWN_BIN_DIRS = [
-  NODE_BIN_DIR,
-  join(HOME_DIR, ".npm-global", "bin"),
-  join(HOME_DIR, "AppData", "Roaming", "npm"),
-  join(HOME_DIR, ".pnpm"),
-  join(HOME_DIR, "Library", "pnpm"),
-  join(HOME_DIR, ".config", "yarn", "global", "node_modules", ".bin"),
-  join(HOME_DIR, ".local", "bin"),
-  join(HOME_DIR, ".bun", "bin"),
-  join(HOME_DIR, ".volta", "bin"),
-  join(HOME_DIR, ".asdf", "shims"),
-  join(HOME_DIR, ".nvm", "current", "bin"),
-  "/opt/homebrew/bin",
-  "/opt/homebrew/sbin",
-  "/usr/local/bin",
-  "/usr/local/sbin",
-];
-
-function unique(values: string[]): string[] {
-  const seen = new Set<string>();
-  const out: string[] = [];
-  for (const value of values) {
-    if (!value || seen.has(value)) continue;
-    seen.add(value);
-    out.push(value);
-  }
-  return out;
-}
-
-export const SUBPROCESS_ENV: NodeJS.ProcessEnv = {
-  ...process.env,
-  HOME: HOME_DIR,
-  PATH: unique([
-    ...KNOWN_BIN_DIRS,
-    ...(process.env.PATH ?? "").split(delimiter),
-  ]).join(delimiter),
-};
-
-let cachedOpenclawBin: string | null = null;
-let cachedOpenclawConfigPath: string | null = null;
-
-function resolveWindowsExecutable(pathValue: string): string | null {
-  if (!IS_WINDOWS) {
-    return existsSync(pathValue) ? pathValue : null;
-  }
-
-  const trimmed = pathValue.trim().replace(/^['"]|['"]$/g, "");
-  if (!trimmed) return null;
-  if (existsSync(trimmed)) return trimmed;
-
-  for (const ext of [".cmd", ".exe", ".bat"]) {
-    const candidate = `${trimmed}${ext}`;
-    if (existsSync(candidate)) {
-      return candidate;
-    }
-  }
-
-  return null;
-}
-
-function normalizeResolvedOpenclawBin(pathValue: string | null): string | null {
-  if (!pathValue) return null;
-  return resolveWindowsExecutable(pathValue) ?? (existsSync(pathValue) ? pathValue : null);
-}
-
-function findOpenclawInKnownPaths(): string | null {
-  for (const dir of KNOWN_BIN_DIRS) {
-    for (const name of OPENCLAW_CANDIDATE_NAMES) {
-      const candidate = join(dir, name);
-      if (existsSync(candidate)) {
-        return candidate;
-      }
-    }
-  }
-  return null;
-}
-
-function resolveViaShell(): string | null {
-  const options: ExecSyncOptionsWithStringEncoding = {
-    stdio: "pipe",
-    env: SUBPROCESS_ENV,
-    timeout: 3000,
-    encoding: "utf8",
-  };
-
-  const commands = IS_WINDOWS
-    ? ["where.exe openclaw"]
-    : ["command -v openclaw", "which openclaw"];
-
-  for (const command of commands) {
-    try {
-      const resolved = execSync(command, options)
-        .trim()
-        .split(/\r?\n/)
-        .map((line) => line.trim())
-        .find(Boolean);
-      const normalized = normalizeResolvedOpenclawBin(resolved ?? null);
-      if (normalized) {
-        return normalized;
-      }
-    } catch {
-      // try next strategy
-    }
-  }
-  return null;
-}
-
-function readCommandOutput(command: string): string | null {
-  const options: ExecSyncOptionsWithStringEncoding = {
-    stdio: "pipe",
-    env: SUBPROCESS_ENV,
-    timeout: 3000,
-    encoding: "utf8",
-  };
-
-  try {
-    const output = execSync(command, options).trim();
-    return output || null;
-  } catch {
-    return null;
-  }
-}
-
-function findOpenclawViaPackageManagers(): string | null {
-  const candidateDirs: string[] = [];
-
-  const npmPrefix = readCommandOutput("npm config get prefix");
-  if (npmPrefix && !/^undefined|null$/i.test(npmPrefix)) {
-    candidateDirs.push(IS_WINDOWS ? npmPrefix : join(npmPrefix, "bin"));
-  }
-
-  const pnpmGlobalBin = readCommandOutput("pnpm config get global-bin-dir");
-  if (pnpmGlobalBin && !/^undefined|null$/i.test(pnpmGlobalBin)) {
-    candidateDirs.push(pnpmGlobalBin);
-  }
-
-  const npmExec = readCommandOutput("npm exec --yes -- which openclaw");
-  {
-    const normalized = normalizeResolvedOpenclawBin(npmExec);
-    if (normalized) {
-      return normalized;
-    }
-  }
-
-  for (const dir of unique(candidateDirs)) {
-    for (const name of OPENCLAW_CANDIDATE_NAMES) {
-      const candidate = join(dir, name);
-      if (existsSync(candidate)) {
-        return candidate;
-      }
-    }
-  }
-
-  return null;
-}
-
-export function resolveOpenclawBin(forceRefresh = false): string {
-  if (!forceRefresh && cachedOpenclawBin && existsSync(cachedOpenclawBin)) {
-    return cachedOpenclawBin;
-  }
-
-  const envOverride = process.env.OPENCLAW_BIN;
-  if (envOverride && existsSync(envOverride)) {
-    cachedOpenclawBin = normalizeResolvedOpenclawBin(envOverride) ?? envOverride;
-    console.log(`[clawpilot] openclaw resolved from OPENCLAW_BIN: ${envOverride}`);
-    return cachedOpenclawBin;
-  }
-
-  const resolved = resolveViaShell() ?? findOpenclawViaPackageManagers() ?? findOpenclawInKnownPaths();
-  if (resolved) {
-    cachedOpenclawBin = resolved;
-    console.log(`[clawpilot] openclaw resolved: ${resolved}`);
-    return resolved;
-  }
-
-  cachedOpenclawBin = IS_WINDOWS ? "openclaw.cmd" : "openclaw";
-  console.warn("[clawpilot] could not resolve openclaw path, using bare name");
-  return cachedOpenclawBin;
-}
-
-function splitShellArgs(input: string): string[] {
-  const args: string[] = [];
-  let current = "";
-  let quote: "'" | '"' | null = null;
-  let escaping = false;
-
-  for (const ch of input) {
-    if (escaping) {
-      current += ch;
-      escaping = false;
-      continue;
-    }
-
-    if (ch === "\\") {
-      escaping = true;
-      continue;
-    }
-
-    if (quote) {
-      if (ch === quote) {
-        quote = null;
-      } else {
-        current += ch;
-      }
-      continue;
-    }
-
-    if (ch === "'" || ch === '"') {
-      quote = ch;
-      continue;
-    }
-
-    if (/\s/.test(ch)) {
-      if (current) {
-        args.push(current);
-        current = "";
-      }
-      continue;
-    }
-
-    current += ch;
-  }
-
-  if (escaping) current += "\\";
-  if (current) args.push(current);
-  return args;
-}
-
-function quoteWindowsArg(value: string): string {
-  if (value.length === 0) return '""';
-  if (!/[\s"]/u.test(value)) return value;
-  return `"${value.replace(/"/g, '\\"')}"`;
-}
-
-function execErrorOutput(err: unknown): string {
-  const e = err as { stdout?: Buffer | string; stderr?: Buffer | string };
-  const out = e.stdout?.toString() ?? "";
-  const errStr = e.stderr?.toString() ?? "";
-  return [out, errStr].filter(Boolean).join("\n").trim();
-}
-
-export function execOpenclaw(args: string): Buffer {
-  let bin = resolveOpenclawBin();
-  const argv = splitShellArgs(args);
-  try {
-    if (IS_WINDOWS) {
-      bin = normalizeResolvedOpenclawBin(bin) ?? bin;
-    }
-    if (IS_WINDOWS && !/\.exe$/i.test(bin)) {
-      const command = [quoteWindowsArg(bin), ...argv.map(quoteWindowsArg)].join(" ");
-      return execFileSync(process.env.ComSpec || "cmd.exe", ["/d", "/s", "/c", command], { stdio: "pipe", env: SUBPROCESS_ENV });
-    }
-    return execFileSync(bin, argv, { stdio: "pipe", env: SUBPROCESS_ENV });
-  } catch (error) {
-    const output = execErrorOutput(error);
-    const shouldRetry =
-      bin === "openclaw" ||
-      /command not found|ENOENT|not recognized/i.test(output);
-
-    if (!shouldRetry) {
-      throw error;
-    }
-
-    bin = resolveOpenclawBin(true);
-    if (IS_WINDOWS) {
-      bin = normalizeResolvedOpenclawBin(bin) ?? bin;
-    }
-    if (IS_WINDOWS && !/\.exe$/i.test(bin)) {
-      const command = [quoteWindowsArg(bin), ...argv.map(quoteWindowsArg)].join(" ");
-      return execFileSync(process.env.ComSpec || "cmd.exe", ["/d", "/s", "/c", command], { stdio: "pipe", env: SUBPROCESS_ENV });
-    }
-    return execFileSync(bin, argv, { stdio: "pipe", env: SUBPROCESS_ENV });
-  }
-}
-
-const DEFAULT_OPENCLAW_CONFIG_PATH = join(HOME_DIR, ".openclaw", "openclaw.json");
-
-function resolveEnvPlaceholder(name: string): string | null {
-  if (name === "OPENCLAW_HOME") {
-    return process.env.OPENCLAW_HOME ?? HOME_DIR;
-  }
-
-  if (name === "HOME") {
-    return process.env.HOME ?? HOME_DIR;
-  }
-
-  if (name === "USERPROFILE") {
-    return process.env.USERPROFILE ?? HOME_DIR;
-  }
-
-  return process.env[name] ?? null;
-}
-
-function expandEnvVars(value: string): string {
-  return value
-    .replace(/\$\{([^}]+)\}/g, (match, name) => resolveEnvPlaceholder(name) ?? match)
-    .replace(/\$([A-Za-z_][A-Za-z0-9_]*)/g, (match, name) => resolveEnvPlaceholder(name) ?? match)
-    .replace(/%([^%]+)%/g, (match, name) => resolveEnvPlaceholder(name) ?? match);
-}
-
-function normalizeOpenclawPath(value: string): string {
-  const trimmed = expandEnvVars(value.trim().replace(/^['"]|['"]$/g, ""));
-  if (trimmed === "~") return HOME_DIR;
-  if (trimmed.startsWith("~/")) {
-    return join(HOME_DIR, trimmed.slice(2));
-  }
-  return trimmed;
-}
-
-export function resolveOpenclawConfigPath(forceRefresh = false): string {
-  if (!forceRefresh && cachedOpenclawConfigPath && existsSync(cachedOpenclawConfigPath)) {
-    return cachedOpenclawConfigPath;
-  }
-
-  try {
-    const output = execOpenclaw("config file").toString("utf8").trim();
-    const resolved = output
-      .split("\n")
-      .map(line => line.trim())
-      .find(line => line.endsWith(".json"));
-
-    if (resolved) {
-      const normalized = normalizeOpenclawPath(resolved);
-      if (!/[$%]/.test(normalized)) {
-        cachedOpenclawConfigPath = normalized;
-        return normalized;
-      }
-    }
-  } catch {
-    // Fall back to the legacy path search below.
-  }
-
-  cachedOpenclawConfigPath = DEFAULT_OPENCLAW_CONFIG_PATH;
-  return DEFAULT_OPENCLAW_CONFIG_PATH;
-}
-
-export function resolveOpenclawDir(forceRefresh = false): string {
-  return dirname(resolveOpenclawConfigPath(forceRefresh));
-}

package/src/commands/pair.ts

@@ -1,128 +0,0 @@
-import { hostname } from "os";
-import { execSync } from "child_process";
-import { getManagedServiceInstallHint, getServicePlatform, supportsManagedServiceInstall } from "../platform/service-manager.js";
-
-function sanitizeDisplayName(name: string): string {
-  // Replace smart quotes and other problematic characters with regular ones
-  return name
-    .replace(/[\u2018\u2019\u201C\u201D]/g, "'")  // Smart quotes → regular quotes
-    .replace(/[\u2013\u2014]/g, "-")              // En/em dashes → regular dash
-    .replace(/[\u00A0]/g, " ")                    // Non-breaking space → regular space
-    .replace(/[^\x20-\x7E]/g, "");               // Remove any other non-ASCII characters
-}
-
-function getDisplayName(): string {
-  if (getServicePlatform() !== "macos") {
-    return hostname();
-  }
-  try {
-    const raw = execSync("scutil --get ComputerName", { encoding: "utf8" }).trim();
-    return sanitizeDisplayName(raw);
-  } catch {
-    return hostname();
-  }
-}
-import { configExists, readConfig, writeConfig } from "../config/config.js";
-import { installCommand } from "./install.js";
-import qrcodeTerminal from "qrcode-terminal";
-import { t } from "../i18n/index.js";
-import { DEFAULT_RELAY_SERVER } from "../generated/build-config.js";
-
-interface PairOptions {
-  server?: string;
-  name?: string;
-  codeOnly?: boolean;
-}
-
-export async function pairCommand(opts: PairOptions): Promise<void> {
-  const relayServerUrl = opts.server ?? DEFAULT_RELAY_SERVER;
-  const httpBase = relayServerUrl.replace(/^wss?/, "http");
-
-  let gatewayId: string;
-  let relaySecret: string;
-  let accessCode: string;
-  let displayName: string;
-
-  if (configExists()) {
-    const config = readConfig();
-    gatewayId = config.gatewayId;
-    relaySecret = config.relaySecret;
-    displayName = opts.name ? sanitizeDisplayName(opts.name) : config.displayName;
-
-    console.log(t("pair.alreadyRegistered", gatewayId));
-
-    const res = await fetch(`${httpBase}/api/relay/accesscode`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ gatewayId, relaySecret }),
-    });
-
-    if (!res.ok) {
-      const body = await res.text();
-      if (res.status === 401) {
-        throw new Error(t("pair.invalidCredentials"));
-      }
-      throw new Error(t("pair.refreshFailed", String(res.status), body));
-    }
-
-    const data = (await res.json()) as { accessCode: string };
-    accessCode = data.accessCode;
-
-    writeConfig({ ...config, relayServerUrl, displayName });
-  } else {
-    displayName = opts.name ? sanitizeDisplayName(opts.name) : getDisplayName();
-    console.log(t("pair.registering"));
-
-    const res = await fetch(`${httpBase}/api/relay/register`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ displayName }),
-    });
-
-    if (!res.ok) {
-      const body = await res.text();
-      throw new Error(t("pair.registrationFailed", String(res.status), body));
-    }
-
-    const data = (await res.json()) as {
-      gatewayId: string;
-      relaySecret: string;
-      accessCode: string;
-    };
-
-    gatewayId = data.gatewayId;
-    relaySecret = data.relaySecret;
-    accessCode = data.accessCode;
-
-    writeConfig({ relayServerUrl, gatewayId, relaySecret, displayName });
-
-    console.log(t("pair.registered", gatewayId));
-  }
-
-  const qrPayload = JSON.stringify({
-    version: 1,
-    server: httpBase,
-    gatewayId,
-    accessCode,
-    displayName,
-  });
-
-  if (opts.codeOnly) {
-    console.log(accessCode);
-  } else {
-    console.log(t("pair.scanQR"));
-    qrcodeTerminal.generate(qrPayload, { small: true });
-    console.log(t("pair.accessCode", accessCode));
-  }
-
-  if ((getServicePlatform() === "linux" || getServicePlatform() === "windows") && !supportsManagedServiceInstall()) {
-    console.log(t("pair.installGlobalHint"));
-    const hint = getManagedServiceInstallHint();
-    if (hint) {
-      console.log(t("install.startManually", hint));
-    }
-  }
-
-  console.log(t("pair.installingService"));
-  installCommand();
-}