@anusornneal/chat-relay 0.7.2 → 0.8.0

package/cli/index.mjs

@@ -1,6 +1,6 @@
 import { clearConfig, configPath, loadConfig, saveConfig } from "./config.mjs";
 import { login, requestJson } from "./device-login.mjs";
-import { remote, validateConfig } from "./remote.mjs";
+import { protocolCompatibility, remote, validateConfig } from "./remote.mjs";
 
 function parseOptions(args) {
   const options = {};
@@ -31,6 +31,9 @@ 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 drain              Stop accepting new long-running work
+  chat-relay resume             Resume normal work admission
+  chat-relay restart            Restart after drain completes
   chat-relay logout             Revoke this computer login
   chat-relay help               Show this help
 
@@ -124,6 +127,15 @@ async function status() {
       "Scopes:   " +
       (Array.isArray(agentStatus.data.scopes) ? agentStatus.data.scopes.join(",") : "-"),
     );
+    const connection = agentStatus.data.connection || {};
+    const compatibility = protocolCompatibility(connection.protocolVersion, agentStatus.data.expectedProtocolVersion);
+    console.log("Version:  " + (connection.agentVersion || "-"));
+    console.log(`Protocol: ${connection.protocolVersion ?? "?"}/${agentStatus.data.expectedProtocolVersion ?? "?"} (${compatibility})`);
+    if (agentStatus.data.lifecycle) {
+      const lifecycle = agentStatus.data.lifecycle;
+      console.log("Lifecycle: " + lifecycle.state + (lifecycle.readyToRestart ? " (ready to restart)" : ""));
+      if (lifecycle.work?.total) console.log("ActiveWork: " + lifecycle.work.total);
+    }
   }
   console.log("Files:   " + config.allowedRoots);
   console.log("Desktop: " + (config.desktopEnabled === true ? "enabled" : "disabled"));
@@ -139,6 +151,31 @@ async function status() {
   }
   return 0;
 }
+async function lifecycleAction(action) {
+  const config = loadConfig();
+  if (!config) {
+    console.error("Chat Relay: not signed in");
+    return 1;
+  }
+  const result = await requestJson(config.relayUrl + "/relay?agentId=" + encodeURIComponent(config.agentId), {
+    method: "POST",
+    headers: { authorization: "Bearer " + config.userToken, "content-type": "application/json" },
+    body: JSON.stringify({ payload: { action: "agent.lifecycle." + action } }),
+  }).catch((error) => ({ response: { ok: false, status: 0 }, data: { error: error.message } }));
+  if (!result.response.ok) {
+    console.error("Lifecycle action failed: " + (result.data?.error || ("HTTP " + result.response.status)));
+    return 1;
+  }
+  const payload = result.data?.payload || result.data;
+  if (payload?.ok === false) {
+    console.error("Lifecycle action rejected: " + (payload.error || "unknown_error"));
+    if (payload.lifecycle?.work?.total) console.error("Active work remaining: " + payload.lifecycle.work.total);
+    return 1;
+  }
+  console.log("Agent lifecycle: " + (payload?.lifecycle?.state || "unknown"));
+  return 0;
+}
+
 async function logout() {
   const config = loadConfig();
   if (!config) {
@@ -190,6 +227,9 @@ export async function runCli(argv = process.argv.slice(2)) {
 
   if (command === "logout") return logout();
   if (command === "status") return status();
+  if (command === "drain") return lifecycleAction("drain");
+  if (command === "resume") return lifecycleAction("resume");
+  if (command === "restart") return lifecycleAction("restart");
   if (command === "remote") {
     await remote(options);
     return 0;

package/cli/remote.mjs

@@ -1,4 +1,4 @@
-import { spawn } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import path from "node:path";
 import { loadConfig, saveConfig } from "./config.mjs";
@@ -7,6 +7,32 @@ import { login, requestJson } from "./device-login.mjs";
 const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 let stopping = false;
 
+export function shouldRestartAgent(result, stoppingNow = false) {
+  return !stoppingNow && result?.code !== 2 && result?.code !== 3;
+}
+
+export function protocolCompatibility(agentProtocolVersion, expectedProtocolVersion) {
+  if (agentProtocolVersion === null || agentProtocolVersion === undefined || expectedProtocolVersion === null || expectedProtocolVersion === undefined) return "unknown";
+  if (!Number.isInteger(Number(agentProtocolVersion)) || !Number.isInteger(Number(expectedProtocolVersion))) return "unknown";
+  return Number(agentProtocolVersion) === Number(expectedProtocolVersion) ? "compatible" : "incompatible";
+}
+
+function terminateChildTree(child) {
+  if (child.killed) return;
+  if (process.platform === "win32" && child.pid) {
+    const pid = child.pid;
+    execFile("taskkill.exe", ["/PID", String(pid), "/T"], { windowsHide: true }, () => {
+      setTimeout(() => {
+        if (child.exitCode === null && child.signalCode === null) {
+          execFile("taskkill.exe", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, () => {});
+        }
+      }, 1000);
+    });
+    return;
+  }
+  child.kill("SIGTERM");
+}
+
 async function validateConfig(config) {
   if (!config?.relayUrl || !config?.userToken || !config?.agentToken || !config?.agentId) return false;
   const { response } = await requestJson(`${config.relayUrl}/auth/me`, {
@@ -49,6 +75,7 @@ function spawnAgent(config) {
 }
 
 export async function remote(options = {}) {
+  stopping = false;
   let config = loadConfig();
   if (!(await validateConfig(config))) {
     console.log("No valid Chat Relay login found. Starting sign in...");
@@ -71,7 +98,7 @@ export async function remote(options = {}) {
 
     const stop = () => {
       stopping = true;
-      if (!child.killed) child.kill();
+      terminateChildTree(child);
     };
     process.once("SIGINT", stop);
     process.once("SIGTERM", stop);
@@ -84,10 +111,28 @@ export async function remote(options = {}) {
     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));
+    if (result.code === 2) {
+      stopping = true;
+      console.error("Agent authorization is no longer valid. Run chat-relay login --force, then chat-relay remote.");
+      break;
+    }
+    if (result.code === 3) {
+      stopping = true;
+      console.error("Agent protocol is incompatible with the relay. Update Chat Relay, then run chat-relay remote again.");
+      break;
+    }
+
+    if (result.code === 4) {
+      console.log("Agent restart requested. Restarting local agent...");
+      continue;
+    }
+
+    if (shouldRestartAgent(result, stopping)) {
+      console.error(
+        `Agent stopped (code=${result.code ?? "null"}, signal=${result.signal ?? "none"}). Restarting in 2s...`,
+      );
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@anusornneal/chat-relay",
-    "version": "0.7.2",
+    "version": "0.8.0",
     "description": "Zero-checkout remote MCP agent for ChatGPT with terminal, filesystem, process, multi-user, and multi-agent support.",
     "type": "module",
     "bin": {