ragent-cli 1.6.1 → 1.7.0

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "ragent-cli",
-      version: "1.6.1",
+      version: "1.7.0",
       description: "CLI agent for rAgent Live \u2014 browser-first terminal control plane for AI coding agents",
       main: "dist/index.js",
       bin: {
@@ -262,7 +262,7 @@ var os9 = __toESM(require("os"));
 // src/agent.ts
 var fs4 = __toESM(require("fs"));
 var os8 = __toESM(require("os"));
-var path3 = __toESM(require("path"));
+var path4 = __toESM(require("path"));
 var import_ws5 = __toESM(require("ws"));
 
 // src/auth.ts
@@ -682,6 +682,43 @@ function decodeJwtExp(token) {
     return null;
   }
 }
+async function startSessionWithMachineSecret(params) {
+  console.log("[rAgent] Attempting session recovery with machine credential...");
+  const response = await fetch(`${params.portal}/api/agent/session/start`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      hostId: params.hostId,
+      machineSecret: params.machineSecret
+    })
+  });
+  if (response.status === 401 || response.status === 403) {
+    throw new AuthError(
+      "Machine credential rejected \u2014 agent may be revoked. Re-connect with: ragent connect --token <token>"
+    );
+  }
+  if (!response.ok) {
+    const data2 = await response.json().catch(() => ({}));
+    throw new Error(
+      `Session start failed: ${data2.error || response.status}`
+    );
+  }
+  const data = await response.json();
+  if (!data.agentToken) {
+    throw new Error("Session start response missing agentToken");
+  }
+  const patch = {
+    agentToken: data.agentToken,
+    tokenExpiresAt: data.expiresAt || ""
+  };
+  if (data.refreshToken) {
+    patch.refreshToken = data.refreshToken;
+    patch.refreshExpiresAt = data.refreshExpiresAt || "";
+  }
+  saveConfigPatch(patch);
+  console.log("[rAgent] Session recovered via machine credential.");
+  return data.agentToken;
+}
 async function refreshTokenIfNeeded(params) {
   const config = loadConfig();
   const refreshToken = config.refreshToken;
@@ -707,10 +744,23 @@ async function refreshTokenIfNeeded(params) {
       body: JSON.stringify(body)
     });
     if (!response.ok) {
-      const data2 = await response.json().catch(() => ({}));
+      const errorData = await response.json().catch(() => ({}));
       console.warn(
-        `[rAgent] Token refresh failed: ${data2.error || response.status}`
+        `[rAgent] Token refresh failed: ${errorData.error || response.status}`
       );
+      if (config.machineSecret && config.hostId) {
+        try {
+          return await startSessionWithMachineSecret({
+            portal: params.portal,
+            hostId: config.hostId,
+            machineSecret: config.machineSecret
+          });
+        } catch (mcError) {
+          if (mcError instanceof AuthError) throw mcError;
+          const mcMessage = mcError instanceof Error ? mcError.message : String(mcError);
+          console.warn(`[rAgent] Machine credential recovery failed: ${mcMessage}`);
+        }
+      }
       return params.agentToken;
     }
     const data = await response.json();
@@ -723,10 +773,14 @@ async function refreshTokenIfNeeded(params) {
       patch.refreshToken = data.refreshToken;
       patch.refreshExpiresAt = data.refreshExpiresAt || "";
     }
+    if (data.machineSecret) {
+      patch.machineSecret = data.machineSecret;
+    }
     saveConfigPatch(patch);
     console.log("[rAgent] Token refreshed successfully.");
     return data.agentToken;
   } catch (error) {
+    if (error instanceof AuthError) throw error;
     const message = error instanceof Error ? error.message : String(error);
     console.warn(`[rAgent] Token refresh error: ${message}`);
     return params.agentToken;
@@ -753,6 +807,9 @@ async function claimHost(params) {
   if (!data.agentToken) {
     throw new Error("Missing connector token in claim response");
   }
+  if (data.machineSecret) {
+    saveConfigPatch({ machineSecret: data.machineSecret });
+  }
   return data;
 }
 async function negotiateAgent(params) {
@@ -2030,6 +2087,7 @@ var import_ws4 = __toESM(require("ws"));
 var import_child_process2 = require("child_process");
 var fs2 = __toESM(require("fs"));
 var os6 = __toESM(require("os"));
+var path2 = __toESM(require("path"));
 function assertConfiguredAgentToken() {
   const config = loadConfig();
   if (!config.agentToken) {
@@ -2216,8 +2274,32 @@ async function stopService() {
   }
   await stopPidfileService();
 }
+function killStaleAgentProcesses() {
+  try {
+    const entries = fs2.readdirSync(CONFIG_DIR);
+    for (const entry of entries) {
+      if (!entry.startsWith("agent-") || !entry.endsWith(".pid")) continue;
+      const pidPath = path2.join(CONFIG_DIR, entry);
+      try {
+        const raw = fs2.readFileSync(pidPath, "utf8").trim();
+        const pid = Number.parseInt(raw, 10);
+        if (!Number.isInteger(pid) || pid <= 0) continue;
+        try {
+          process.kill(pid, 0);
+          process.kill(pid, "SIGTERM");
+          console.log(`[rAgent] Stopped stale agent process (pid ${pid})`);
+        } catch {
+        }
+        fs2.unlinkSync(pidPath);
+      } catch {
+      }
+    }
+  } catch {
+  }
+}
 async function restartService() {
   const backend = getConfiguredServiceBackend();
+  killStaleAgentProcesses();
   if (backend === "systemd") {
     await runSystemctlUser(["restart", SERVICE_NAME]);
     console.log("[rAgent] Restarted service via systemd.");
@@ -2231,13 +2313,12 @@ async function printServiceStatus() {
   if (backend === "systemd") {
     const status = await execAsync(
       `systemctl --user status ${shellQuote(SERVICE_NAME)} --no-pager --lines=20`,
-      { timeout: 1e4 }
-    ).catch((error) => {
-      console.log(error.message);
-      return "";
-    });
+      { timeout: 1e4, allowNonZeroExit: true }
+    );
     if (status) {
       process.stdout.write(status);
+    } else {
+      console.log("[rAgent] systemd service is not installed or has no status.");
     }
     return;
   }
@@ -2842,7 +2923,7 @@ var ControlDispatcher = class {
 
 // src/transcript-watcher.ts
 var fs3 = __toESM(require("fs"));
-var path2 = __toESM(require("path"));
+var path3 = __toESM(require("path"));
 var os7 = __toESM(require("os"));
 var import_child_process5 = require("child_process");
 var ClaudeCodeParser = class {
@@ -2978,7 +3059,7 @@ function discoverViaProc(panePid) {
         const fds = fs3.readdirSync(fdDir);
         for (const fd of fds) {
           try {
-            const target = fs3.readlinkSync(path2.join(fdDir, fd));
+            const target = fs3.readlinkSync(path3.join(fdDir, fd));
             if (target.endsWith(".jsonl") && target.includes("/.claude/")) {
               return target;
             }
@@ -2998,7 +3079,7 @@ function discoverViaProc(panePid) {
             const fds = fs3.readdirSync(gcFdDir);
             for (const fd of fds) {
               try {
-                const target = fs3.readlinkSync(path2.join(gcFdDir, fd));
+                const target = fs3.readlinkSync(path3.join(gcFdDir, fd));
                 if (target.endsWith(".jsonl") && target.includes("/.claude/")) {
                   return target;
                 }
@@ -3016,15 +3097,15 @@ function discoverViaProc(panePid) {
   return null;
 }
 function discoverViaCwd(paneCwd) {
-  const claudeProjectsDir = path2.join(os7.homedir(), ".claude", "projects");
+  const claudeProjectsDir = path3.join(os7.homedir(), ".claude", "projects");
   if (!fs3.existsSync(claudeProjectsDir)) return null;
   const resolvedCwd = fs3.realpathSync(paneCwd);
   const expectedDirName = resolvedCwd.replace(/\//g, "-");
-  const projectDir = path2.join(claudeProjectsDir, expectedDirName);
+  const projectDir = path3.join(claudeProjectsDir, expectedDirName);
   if (!fs3.existsSync(projectDir)) return null;
   try {
     const jsonlFiles = fs3.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).map((f) => {
-      const fullPath = path2.join(projectDir, f);
+      const fullPath = path3.join(projectDir, f);
       const stat = fs3.statSync(fullPath);
       return { path: fullPath, mtime: stat.mtimeMs };
     }).sort((a, b) => b.mtime - a.mtime);
@@ -3034,14 +3115,14 @@ function discoverViaCwd(paneCwd) {
   }
 }
 function discoverCodexTranscript() {
-  const codexSessionsDir = path2.join(os7.homedir(), ".codex", "sessions");
+  const codexSessionsDir = path3.join(os7.homedir(), ".codex", "sessions");
   if (!fs3.existsSync(codexSessionsDir)) return null;
   try {
     const dateDirs = fs3.readdirSync(codexSessionsDir).filter((d) => /^\d{4}-\d{2}-\d{2}/.test(d)).sort().reverse();
     for (const dateDir of dateDirs.slice(0, 3)) {
-      const fullDir = path2.join(codexSessionsDir, dateDir);
+      const fullDir = path3.join(codexSessionsDir, dateDir);
       const jsonlFiles = fs3.readdirSync(fullDir).filter((f) => f.startsWith("rollout-") && f.endsWith(".jsonl")).map((f) => {
-        const fp = path2.join(fullDir, f);
+        const fp = path3.join(fullDir, f);
         const stat = fs3.statSync(fp);
         return { path: fp, mtime: stat.mtimeMs };
       }).sort((a, b) => b.mtime - a.mtime);
@@ -3377,7 +3458,7 @@ var TranscriptWatcherManager = class {
 
 // src/agent.ts
 function pidFilePath(hostId) {
-  return path3.join(CONFIG_DIR, `agent-${hostId}.pid`);
+  return path4.join(CONFIG_DIR, `agent-${hostId}.pid`);
 }
 function readPidFile(filePath) {
   try {
@@ -3643,6 +3724,27 @@ async function runAgent(rawOptions) {
         });
       } catch (error) {
         if (error instanceof AuthError) {
+          const cfg = loadConfig();
+          if (cfg.machineSecret && cfg.hostId) {
+            try {
+              options.agentToken = await startSessionWithMachineSecret({
+                portal: options.portal,
+                hostId: cfg.hostId,
+                machineSecret: cfg.machineSecret
+              });
+              inventory.updateOptions(options);
+              dispatcher.updateOptions(options);
+              console.log("[rAgent] Recovered from auth failure via machine credential. Reconnecting...");
+              continue;
+            } catch (mcError) {
+              if (mcError instanceof AuthError) {
+                console.error(`[rAgent] ${mcError.message}`);
+              } else {
+                const mcMsg = mcError instanceof Error ? mcError.message : String(mcError);
+                console.error(`[rAgent] Machine credential recovery failed: ${mcMsg}`);
+              }
+            }
+          }
           console.error(`[rAgent] ${error.message}`);
           console.error(
             "[rAgent] Connector token is invalid or revoked. Stopping. Re-connect with: ragent connect --token <token>"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ragent-cli",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "CLI agent for rAgent Live — browser-first terminal control plane for AI coding agents",
   "main": "dist/index.js",
   "bin": {