@anusornneal/chat-relay 0.6.0 → 0.7.1

package/cli/index.mjs

@@ -1,145 +1,201 @@
-import { clearConfig, configPath, loadConfig } from "./config.mjs";
-import { login, requestJson } from "./device-login.mjs";
-import { remote, validateConfig } from "./remote.mjs";
-
-function parseOptions(args) {
-  const options = {};
-  const rest = [];
-  for (let index = 0; index < args.length; index++) {
-    const arg = args[index];
-    if (arg === "--no-open") options.noOpen = true;
-    else if (arg === "--force") options.force = true;
-    else if (arg === "--relay") options.relayUrl = args[++index];
-    else if (arg.startsWith("--relay=")) options.relayUrl = arg.slice(8);
-    else if (arg === "--root") options.allowedRoot = args[++index];
-    else if (arg.startsWith("--root=")) options.allowedRoot = arg.slice(7);
-    else if (arg === "--name") options.agentName = args[++index];
-    else if (arg.startsWith("--name=")) options.agentName = arg.slice(7);
-    else if (arg === "--agent-id") options.agentId = args[++index];
-    else if (arg.startsWith("--agent-id=")) options.agentId = arg.slice(11);
-    else rest.push(arg);
-  }
-  return { options, rest };
-}
-
-function help() {
-  console.log(`Chat Relay
-
-Usage:
-  chat-relay remote [options]   Connect this computer to ChatGPT
-  chat-relay login [options]    Sign in and register this computer
-  chat-relay status             Show account and connection status
-  chat-relay logout             Revoke this computer login
-  chat-relay help               Show this help
-
-Options:
-  --relay <url>                 Relay Worker URL
-  --root <path>                 Allowed filesystem root (semicolon-separated for multiple)
-  --name <name>                 Computer display name
-  --agent-id <id>               Stable agent identifier
-  --no-open                     Do not open the browser automatically
-  --force                       Force a new login
-
-Examples:
-  npx @anusornneal/chat-relay@latest remote
-  npx @anusornneal/chat-relay@latest login
-  npx @anusornneal/chat-relay@latest status
-`);
-}
-
-async function status() {
-  const config = loadConfig();
-  if (!config) {
-    console.log("Chat Relay: not signed in");
-    console.log(`Config: ${configPath()}`);
-    return 1;
-  }
-
-  const me = await requestJson(`${config.relayUrl}/auth/me`, {
-    headers: { authorization: `Bearer ${config.userToken}` },
-  }).catch((error) => ({ response: { ok: false, status: 0 }, data: { error: error.message } }));
-
-  if (!me.response.ok) {
-    console.log("Chat Relay: login expired or unavailable");
-    console.log(`Relay:  ${config.relayUrl}`);
-    console.log(`Agent:  ${config.agentName} (${config.agentId})`);
-    console.log(`Config: ${configPath()}`);
-    return 1;
-  }
-
-  const agentStatus = await requestJson(
-    `${config.relayUrl}/status?agentId=${encodeURIComponent(config.agentId)}`,
-    { headers: { authorization: `Bearer ${config.userToken}` } },
-  ).catch(() => ({ response: { ok: false }, data: { online: false } }));
-
-  console.log("Chat Relay");
-  console.log("----------");
-  console.log(`Account: ${me.data.user?.name || me.data.user?.login || "signed in"}`);
-  console.log(`Login:   ${me.data.user?.login || "-"}`);
-  console.log(`Agent:   ${config.agentName} (${config.agentId})`);
-  console.log(`Remote:  ${agentStatus.response.ok && agentStatus.data.online ? "connected" : "offline"}`);
-  console.log(`Files:   ${config.allowedRoots}`);
-  console.log(`Config:  ${configPath()}`);
-  return 0;
-}
-
-async function logout() {
-  const config = loadConfig();
-  if (!config) {
-    console.log("Chat Relay: already logged out");
-    return 0;
-  }
-
-  let revoked = false;
-  try {
-    const result = await requestJson(`${config.relayUrl}/auth/logout`, {
-      method: "POST",
-      headers: { authorization: `Bearer ${config.userToken}` },
-      body: JSON.stringify({ agentId: config.agentId }),
-    });
-    revoked = result.response.ok || result.response.status === 401;
-    if (!revoked) {
-      throw new Error(result.data.error || `HTTP ${result.response.status}`);
-    }
-  } catch (error) {
-    console.error(`Logout could not revoke the server session: ${error instanceof Error ? error.message : error}`);
-    console.error("Local credentials were kept. Retry when the relay is reachable.");
-    return 1;
-  }
-
-  clearConfig();
-  console.log("Chat Relay: logged out and local credentials removed");
-  return 0;
-}
-
-export async function runCli(argv = process.argv.slice(2)) {
-  const command = (argv[0] || "remote").toLowerCase();
-  const { options } = parseOptions(argv.slice(1));
-
-  if (command === "help" || command === "--help" || command === "-h") {
-    help();
-    return 0;
-  }
-
-  if (command === "login") {
-    const current = loadConfig();
-    if (!options.force && await validateConfig(current)) {
-      console.log(`Already signed in as ${current.user?.name || current.user?.login || "user"}.`);
-      console.log("Use --force to sign in again.");
-      return 0;
-    }
-    await login(options);
-    return 0;
-  }
-
-  if (command === "logout") return logout();
-  if (command === "status") return status();
-  if (command === "remote") {
-    await remote(options);
-    return 0;
-  }
-
-  console.error(`Unknown command: ${command}`);
-  help();
-  return 1;
-}
+import { clearConfig, configPath, loadConfig, saveConfig } from "./config.mjs";
+import { login, requestJson } from "./device-login.mjs";
+import { remote, validateConfig } from "./remote.mjs";
+
+function parseOptions(args) {
+  const options = {};
+  const rest = [];
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+    if (arg === "--no-open") options.noOpen = true;
+    else if (arg === "--force") options.force = true;
+    else if (arg === "--desktop") options.desktopEnabled = true;
+    else if (arg === "--no-desktop") options.desktopEnabled = false;
+    else if (arg === "--relay") options.relayUrl = args[++index];
+    else if (arg.startsWith("--relay=")) options.relayUrl = arg.slice(8);
+    else if (arg === "--root") options.allowedRoot = args[++index];
+    else if (arg.startsWith("--root=")) options.allowedRoot = arg.slice(7);
+    else if (arg === "--name") options.agentName = args[++index];
+    else if (arg.startsWith("--name=")) options.agentName = arg.slice(7);
+    else if (arg === "--agent-id") options.agentId = args[++index];
+    else if (arg.startsWith("--agent-id=")) options.agentId = arg.slice(11);
+    else rest.push(arg);
+  }
+  return { options, rest };
+}
+
+function help() {
+  console.log(`Chat Relay
+
+Usage:
+  chat-relay remote [options]   Connect this computer to ChatGPT
+  chat-relay login [options]    Sign in and register this computer
+  chat-relay status             Show account and connection status
+  chat-relay logout             Revoke this computer login
+  chat-relay help               Show this help
+
+Options:
+  --relay <url>                 Relay Worker URL
+  --root <path>                 Allowed filesystem root (semicolon-separated for multiple)
+  --name <name>                 Computer display name
+  --agent-id <id>               Stable agent identifier
+  --desktop                     Enable Windows desktop screenshot/input access
+  --no-desktop                  Disable desktop access (default)
+  --no-open                     Do not open the browser automatically
+  --force                       Force a new login
+
+Examples:
+  npx @anusornneal/chat-relay@latest remote
+  npx @anusornneal/chat-relay@latest login
+  npx @anusornneal/chat-relay@latest status
+`);
+}
+
+async function status() {
+  const config = loadConfig();
+  if (!config) {
+    console.log("Chat Relay: not signed in");
+    console.log("Access:  sign-in required");
+    console.log('Recovery: run "chat-relay login", then "chat-relay remote".');
+    console.log("Config:  " + configPath());
+    return 1;
+  }
+
+  const me = await requestJson(config.relayUrl + "/auth/me", {
+    headers: { authorization: "Bearer " + config.userToken },
+  }).catch((error) => ({
+    response: { ok: false, status: 0 },
+    data: { error: error.message },
+  }));
+
+  if (!me.response.ok) {
+    console.log("Chat Relay");
+    console.log("----------");
+    console.log("Relay:   " + config.relayUrl);
+    console.log("Device:  " + config.agentName + " (" + config.agentId + ")");
+    if (me.response.status === 401 || me.response.status === 403) {
+      console.log("Access:  sign-in expired");
+      console.log('Recovery: run "chat-relay login --force", then "chat-relay remote".');
+    } else {
+      console.log("Access:  relay unavailable");
+      console.log("Recovery: retry status when the relay is reachable.");
+    }
+    console.log("Config:  " + configPath());
+    return 1;
+  }
+
+  const agentStatus = await requestJson(
+    config.relayUrl + "/status?agentId=" + encodeURIComponent(config.agentId),
+    { headers: { authorization: "Bearer " + config.userToken } },
+  ).catch((error) => ({
+    response: { ok: false, status: 0 },
+    data: { error: error.message, online: false },
+  }));
+
+  const serverAgentName = agentStatus.response.ok && agentStatus.data.agentName
+    ? String(agentStatus.data.agentName)
+    : config.agentName;
+  if (agentStatus.response.ok && serverAgentName !== config.agentName) {
+    saveConfig({ ...config, agentName: serverAgentName });
+  }
+
+  const reauthorizationRequired = agentStatus.response.ok
+    ? agentStatus.data.reauthorizationRequired === true || agentStatus.data.authorized === false
+    : agentStatus.response.status === 401 || agentStatus.response.status === 403;
+
+  console.log("Chat Relay");
+  console.log("----------");
+  console.log(
+    "Account: " +
+    (me.data.user?.name || me.data.user?.login || "signed in") +
+    " (" + (me.data.user?.id || "unknown") + ")",
+  );
+  console.log("Login:   " + (me.data.user?.login || "-"));
+  console.log("Device:  " + serverAgentName + " (" + config.agentId + ")");
+  console.log("Relay:   " + config.relayUrl);
+  console.log("Access:  " + (reauthorizationRequired ? "re-authorization required" : "authorized"));
+  console.log(
+    "Remote:  " +
+    (agentStatus.response.ok && agentStatus.data.online ? "connected" : "offline"),
+  );
+  if (agentStatus.response.ok) {
+    console.log("LastSeen: " + (agentStatus.data.lastSeenAt || "-"));
+    console.log(
+      "Scopes:   " +
+      (Array.isArray(agentStatus.data.scopes) ? agentStatus.data.scopes.join(",") : "-"),
+    );
+  }
+  console.log("Files:   " + config.allowedRoots);
+  console.log("Desktop: " + (config.desktopEnabled === true ? "enabled" : "disabled"));
+  console.log("Config:  " + configPath());
+
+  if (reauthorizationRequired) {
+    console.log('Recovery: run "chat-relay login --force", then "chat-relay remote".');
+    return 1;
+  }
+  if (!agentStatus.response.ok && agentStatus.response.status === 0) {
+    console.log("Recovery: retry status when the relay is reachable.");
+    return 1;
+  }
+  return 0;
+}
+async function logout() {
+  const config = loadConfig();
+  if (!config) {
+    console.log("Chat Relay: already logged out");
+    return 0;
+  }
+
+  let revoked = false;
+  try {
+    const result = await requestJson(`${config.relayUrl}/auth/logout`, {
+      method: "POST",
+      headers: { authorization: `Bearer ${config.userToken}` },
+      body: JSON.stringify({ agentId: config.agentId }),
+    });
+    revoked = result.response.ok || result.response.status === 401;
+    if (!revoked) {
+      throw new Error(result.data.error || `HTTP ${result.response.status}`);
+    }
+  } catch (error) {
+    console.error(`Logout could not revoke the server session: ${error instanceof Error ? error.message : error}`);
+    console.error("Local credentials were kept. Retry when the relay is reachable.");
+    return 1;
+  }
+
+  clearConfig();
+  console.log("Chat Relay: logged out and local credentials removed");
+  return 0;
+}
+
+export async function runCli(argv = process.argv.slice(2)) {
+  const command = (argv[0] || "remote").toLowerCase();
+  const { options } = parseOptions(argv.slice(1));
+
+  if (command === "help" || command === "--help" || command === "-h") {
+    help();
+    return 0;
+  }
+
+  if (command === "login") {
+    const current = loadConfig();
+    if (!options.force && await validateConfig(current)) {
+      console.log(`Already signed in as ${current.user?.name || current.user?.login || "user"}.`);
+      console.log("Use --force to sign in again.");
+      return 0;
+    }
+    await login(options);
+    return 0;
+  }
+
+  if (command === "logout") return logout();
+  if (command === "status") return status();
+  if (command === "remote") {
+    await remote(options);
+    return 0;
+  }
+
+  console.error(`Unknown command: ${command}`);
+  help();
+  return 1;
+}

package/cli/remote.mjs

@@ -1,88 +1,94 @@
-import { spawn } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import path from "node:path";
-import { loadConfig, saveConfig } from "./config.mjs";
-import { login, requestJson } from "./device-login.mjs";
-
-const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-let stopping = false;
-
-async function validateConfig(config) {
-  if (!config?.relayUrl || !config?.userToken || !config?.agentToken || !config?.agentId) return false;
-  const { response } = await requestJson(`${config.relayUrl}/auth/me`, {
-    headers: { authorization: `Bearer ${config.userToken}` },
-  }).catch(() => ({ response: { ok: false } }));
-  return Boolean(response.ok);
-}
-
-function printSummary(config) {
-  console.log("");
-  console.log("Chat Relay Remote");
-  console.log("-----------------");
-  console.log(`Account:    ${config.user?.name || config.user?.login || "signed in"}`);
-  console.log(`Relay:      ${config.relayUrl}`);
-  console.log(`Agent:      ${config.agentName} (${config.agentId})`);
-  console.log(`Files:      ${config.allowedRoots}`);
-  console.log(`Terminal:   ${config.terminalEnabled === false ? "disabled" : "enabled"}`);
-  console.log("");
-}
-
-function spawnAgent(config) {
-  const agentPath = path.join(packageRoot, "agent", "local-agent.mjs");
-  const cwd = String(config.allowedRoots || process.cwd()).split(";")[0] || process.cwd();
-  return spawn(process.execPath, [agentPath], {
-    cwd,
-    env: {
-      ...process.env,
-      RELAY_URL: config.relayUrl,
-      AGENT_ID: config.agentId,
-      AGENT_NAME: config.agentName,
-      AGENT_TOKEN: config.agentToken,
-      TERMINAL_ENABLED: config.terminalEnabled === false ? "0" : "1",
-      ALLOWED_ROOTS: config.allowedRoots,
-    },
-    stdio: "inherit",
-    windowsHide: false,
-  });
-}
-
-export async function remote(options = {}) {
-  let config = loadConfig();
-  if (!(await validateConfig(config))) {
-    console.log("No valid Chat Relay login found. Starting sign in...");
-    config = await login(options);
-  }
-
-  if (options.allowedRoot && options.allowedRoot !== config.allowedRoots) {
-    config = { ...config, allowedRoots: options.allowedRoot };
-    saveConfig(config);
-  }
-
-  printSummary(config);
-
-  while (!stopping) {
-    const child = spawnAgent(config);
-
-    const stop = () => {
-      stopping = true;
-      if (!child.killed) child.kill();
-    };
-    process.once("SIGINT", stop);
-    process.once("SIGTERM", stop);
-
-    const result = await new Promise((resolve) => {
-      child.once("exit", (code, signal) => resolve({ code, signal }));
-    });
-
-    process.removeListener("SIGINT", stop);
-    process.removeListener("SIGTERM", stop);
-    if (stopping) break;
-
-    console.error(
-      `Agent stopped (code=${result.code ?? "null"}, signal=${result.signal ?? "none"}). Restarting in 2s...`,
-    );
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-  }
-}
-
-export { validateConfig };
+import { spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
+import { loadConfig, saveConfig } from "./config.mjs";
+import { login, requestJson } from "./device-login.mjs";
+
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+let stopping = false;
+
+async function validateConfig(config) {
+  if (!config?.relayUrl || !config?.userToken || !config?.agentToken || !config?.agentId) return false;
+  const { response } = await requestJson(`${config.relayUrl}/auth/me`, {
+    headers: { authorization: `Bearer ${config.userToken}` },
+  }).catch(() => ({ response: { ok: false } }));
+  return Boolean(response.ok);
+}
+
+function printSummary(config) {
+  console.log("");
+  console.log("Chat Relay Remote");
+  console.log("-----------------");
+  console.log(`Account:    ${config.user?.name || config.user?.login || "signed in"}`);
+  console.log(`Relay:      ${config.relayUrl}`);
+  console.log(`Agent:      ${config.agentName} (${config.agentId})`);
+  console.log(`Files:      ${config.allowedRoots}`);
+  console.log(`Terminal:   ${config.terminalEnabled === false ? "disabled" : "enabled"}`);
+  console.log("Desktop:    " + (config.desktopEnabled === true ? "enabled" : "disabled"));
+  console.log("");
+}
+
+function spawnAgent(config) {
+  const agentPath = path.join(packageRoot, "agent", "local-agent.mjs");
+  const cwd = String(config.allowedRoots || process.cwd()).split(";")[0] || process.cwd();
+  return spawn(process.execPath, [agentPath], {
+    cwd,
+    env: {
+      ...process.env,
+      RELAY_URL: config.relayUrl,
+      AGENT_ID: config.agentId,
+      AGENT_NAME: config.agentName,
+      AGENT_TOKEN: config.agentToken,
+      TERMINAL_ENABLED: config.terminalEnabled === false ? "0" : "1",
+      DESKTOP_ENABLED: config.desktopEnabled === true ? "1" : "0",
+      ALLOWED_ROOTS: config.allowedRoots,
+    },
+    stdio: "inherit",
+    windowsHide: false,
+  });
+}
+
+export async function remote(options = {}) {
+  let config = loadConfig();
+  if (!(await validateConfig(config))) {
+    console.log("No valid Chat Relay login found. Starting sign in...");
+    config = await login(options);
+  }
+
+  if (options.allowedRoot && options.allowedRoot !== config.allowedRoots) {
+    config = { ...config, allowedRoots: options.allowedRoot };
+    saveConfig(config);
+  }
+  if (options.desktopEnabled !== undefined && Boolean(options.desktopEnabled) !== Boolean(config.desktopEnabled)) {
+    config = { ...config, desktopEnabled: Boolean(options.desktopEnabled) };
+    saveConfig(config);
+  }
+
+  printSummary(config);
+
+  while (!stopping) {
+    const child = spawnAgent(config);
+
+    const stop = () => {
+      stopping = true;
+      if (!child.killed) child.kill();
+    };
+    process.once("SIGINT", stop);
+    process.once("SIGTERM", stop);
+
+    const result = await new Promise((resolve) => {
+      child.once("exit", (code, signal) => resolve({ code, signal }));
+    });
+
+    process.removeListener("SIGINT", stop);
+    process.removeListener("SIGTERM", stop);
+    if (stopping) break;
+
+    console.error(
+      `Agent stopped (code=${result.code ?? "null"}, signal=${result.signal ?? "none"}). Restarting in 2s...`,
+    );
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+  }
+}
+
+export { validateConfig };