ragent-cli 1.10.0 → 1.11.0

package/dist/index.js

@@ -31,7 +31,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "ragent-cli",
-      version: "1.10.0",
+      version: "1.11.0",
       description: "CLI agent for rAgent Live \u2014 browser-first terminal control plane for AI coding agents",
       main: "dist/index.js",
       bin: {
@@ -86,6 +86,7 @@ var require_package = __commonJS({
       },
       dependencies: {
         "@azure/web-pubsub-client": "^1.0.2",
+        "@ragent/transcript-protocol": "*",
         commander: "^14.0.3",
         figlet: "^1.9.3",
         "node-pty": "^1.1.0",
@@ -97,7 +98,7 @@ var require_package = __commonJS({
         "@cyclonedx/cyclonedx-npm": "^4.2.1",
         "@eslint/js": "^10.0.1",
         "@types/figlet": "^1.7.0",
-        "@types/node": "^20.17.0",
+        "@types/node": "^25.5.0",
         "@types/ws": "^8.5.13",
         eslint: "^10.0.2",
         tsup: "^8.4.0",
@@ -135,10 +136,51 @@ var DEFAULT_RECONNECT_DELAY_MS = 2500;
 var MAX_RECONNECT_DELAY_MS = 3e4;
 var OUTPUT_BUFFER_MAX_BYTES = 100 * 1024;
 
+// src/log.ts
+var LEVELS = { debug: 10, info: 20, warn: 30, error: 40 };
+var configuredLevel = process.env.RAGENT_LOG_LEVEL && LEVELS[process.env.RAGENT_LOG_LEVEL] !== void 0 ? process.env.RAGENT_LOG_LEVEL : "info";
+var threshold = LEVELS[configuredLevel];
+function fmt(module2, message, fields) {
+  if (!fields || Object.keys(fields).length === 0) {
+    return `[${module2}] ${message}`;
+  }
+  const pairs = Object.entries(fields).map(([k, v]) => `${k}=${formatValue(v)}`).join(" ");
+  return `[${module2}] ${message}  ${pairs}`;
+}
+function formatValue(v) {
+  if (v === null) return "null";
+  if (v === void 0) return "undefined";
+  if (typeof v === "string") return v.includes(" ") ? JSON.stringify(v) : v;
+  if (typeof v === "number" || typeof v === "boolean") return String(v);
+  if (v instanceof Error) return JSON.stringify(v.message);
+  try {
+    return JSON.stringify(v);
+  } catch {
+    return "[unserializable]";
+  }
+}
+function createLogger(module2) {
+  return {
+    debug(message, fields) {
+      if (threshold <= LEVELS.debug) console.debug(fmt(module2, message, fields));
+    },
+    info(message, fields) {
+      if (threshold <= LEVELS.info) console.log(fmt(module2, message, fields));
+    },
+    warn(message, fields) {
+      if (threshold <= LEVELS.warn) console.warn(fmt(module2, message, fields));
+    },
+    error(message, fields) {
+      if (threshold <= LEVELS.error) console.error(fmt(module2, message, fields));
+    }
+  };
+}
+
 // src/config.ts
 var crypto = __toESM(require("crypto"));
 var fs = __toESM(require("fs"));
 var os2 = __toESM(require("os"));
+var log = createLogger("config");
 function ensureConfigDir() {
   fs.mkdirSync(CONFIG_DIR, { recursive: true });
 }
@@ -147,9 +189,10 @@ function loadConfig() {
     const stat = fs.statSync(CONFIG_FILE);
     const mode = stat.mode & 511;
     if (mode & 63) {
-      console.warn(
-        `[rAgent] WARNING: Config file ${CONFIG_FILE} has overly permissive permissions (${mode.toString(8)}). Fixing to 0600.`
-      );
+      log.warn("config file has overly permissive permissions; fixing to 0600", {
+        path: CONFIG_FILE,
+        mode: mode.toString(8)
+      });
       fs.chmodSync(CONFIG_FILE, 384);
     }
     return JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8"));
@@ -204,6 +247,7 @@ function inferHostId() {
 }
 
 // src/version.ts
+var log2 = createLogger("version");
 function parseSemver(version) {
   const match = String(version || "").trim().match(/^(\d+)\.(\d+)\.(\d+)/);
   if (!match) return null;
@@ -260,9 +304,10 @@ async function maybeWarnUpdate() {
   if (process.env.RAGENT_DISABLE_UPDATE_CHECK === "true") return;
   const latestVersion = await checkForUpdate({ force: false });
   if (!latestVersion) return;
-  console.log(
-    `[rAgent] Update available: ${CURRENT_VERSION} -> ${latestVersion}. Run: ragent update`
-  );
+  log2.info("update available; run: ragent update", {
+    current: CURRENT_VERSION,
+    latest: latestVersion
+  });
 }
 
 // src/commands/connect.ts
@@ -284,6 +329,7 @@ var os4 = __toESM(require("os"));
 // src/system.ts
 var import_node_child_process = require("child_process");
 var readline = __toESM(require("readline/promises"));
+var log3 = createLogger("system");
 function wait(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -349,8 +395,8 @@ async function askYesNo(question, defaultYes = true) {
 async function installTmuxInteractively() {
   const recipe = await chooseTmuxInstallCommand();
   if (!recipe) {
-    console.log("[rAgent] No supported package manager was detected for tmux auto-install.");
-    console.log("[rAgent] Install tmux manually, then rerun: ragent doctor --fix");
+    log3.info("no supported package manager was detected for tmux auto-install");
+    log3.info("install tmux manually, then rerun: ragent doctor --fix");
     return false;
   }
   const approved = await askYesNo(
@@ -376,6 +422,14 @@ var os3 = __toESM(require("os"));
 var import_child_process = require("child_process");
 
 // src/transcript-parser-v2.ts
+var log4 = createLogger("transcript-parser-v2");
+var DEBUG_PARSE = process.env.RAGENT_DEBUG_TRANSCRIPT === "1";
+function debugTranscriptParse(parser, line, error) {
+  if (!DEBUG_PARSE) return;
+  const message = error instanceof Error ? error.message : String(error);
+  const preview = line.length > 120 ? line.slice(0, 117) + "\u2026" : line;
+  log4.debug("skipping unparseable line", { parser, error: message, preview });
+}
 var blockCounter = 0;
 function genBlockId(prefix) {
   return `${prefix}-${Date.now()}-${(++blockCounter).toString(36)}`;
@@ -421,7 +475,8 @@ var ClaudeCodeParserV2 = class {
     let obj;
     try {
       obj = JSON.parse(line);
-    } catch {
+    } catch (error) {
+      debugTranscriptParse("claude", line, error);
       return [];
     }
     if (!obj.message?.content) return [];
@@ -613,7 +668,8 @@ var CodexCliParserV2 = class {
     let obj;
     try {
       obj = JSON.parse(line);
-    } catch {
+    } catch (error) {
+      debugTranscriptParse("codex", line, error);
       return [];
     }
     const item = obj.response_item;
@@ -662,10 +718,10 @@ function getParserV2(agentType) {
   return factory ? factory() : void 0;
 }
 
-// src/transcript-protocol.ts
+// ../packages/transcript-protocol/src/protocol.ts
 var TRANSCRIPT_SCHEMA_VERSION = 2;
 
-// src/transcript-reducer.ts
+// ../packages/transcript-protocol/src/reducer.ts
 function createEmptySnapshot(sessionId) {
   return {
     schemaVersion: TRANSCRIPT_SCHEMA_VERSION,
@@ -868,6 +924,7 @@ function trimSnapshot(snapshot, maxTurns = MAX_SNAPSHOT_TURNS) {
 }
 
 // src/transcript-watcher.ts
+var log5 = createLogger("transcript-watcher");
 var ClaudeCodeParser = class {
   name = "claude-code";
   /** Maps tool_use id → tool name for matching results back to tools. */
@@ -1211,12 +1268,18 @@ var TranscriptWatcher = class {
   addSubscriber() {
     this.subscriberCount++;
   }
-  /** Remove a subscriber. Stops watching when last subscriber leaves. */
+  /**
+   * Remove a subscriber. Stops watching when the last subscriber leaves.
+   * Returns the remaining subscriber count so callers can synchronize
+   * manager-side bookkeeping (e.g. removing the entry from the active map
+   * only on the last disconnect).
+   */
   removeSubscriber() {
     this.subscriberCount = Math.max(0, this.subscriberCount - 1);
     if (this.subscriberCount === 0) {
       this.stop();
     }
+    return this.subscriberCount;
   }
   /** Stop watching. */
   stop() {
@@ -1379,15 +1442,15 @@ var TranscriptWatcherManager = class {
     }
     const parser = getParser(agentType);
     if (!parser) {
-      console.log(`[rAgent] No transcript parser for agent type "${agentType}"`);
+      log5.info("no transcript parser for agent type", { agentType });
       return { ok: false, reason: "unsupported_agent" };
     }
     const filePath = discoverTranscriptFile(sessionId, agentType);
     if (!filePath) {
-      console.log(`[rAgent] No transcript file found for session ${sessionId}`);
+      log5.info("no transcript file found", { sessionId });
       return { ok: false, reason: "no_transcript" };
     }
-    console.log(`[rAgent] Watching transcript: ${filePath} (${parser.name})`);
+    log5.info("watching transcript", { path: filePath, parser: parser.name });
     const v2Parser = getParserV2(agentType);
     const watcher = new TranscriptWatcher(
       filePath,
@@ -1400,14 +1463,14 @@ var TranscriptWatcherManager = class {
           this.sendOpsFn(sessionId, ops, seq);
         } : void 0,
         onError: (error) => {
-          console.warn(`[rAgent] Transcript watcher error (${sessionId}): ${error}`);
+          log5.warn("transcript watcher error", { sessionId, error: String(error) });
         }
       },
       v2Parser,
       sessionId
     );
     if (!watcher.start()) {
-      console.warn(`[rAgent] Failed to start watching ${filePath}`);
+      log5.warn("failed to start watching", { path: filePath });
       return { ok: false, reason: "watch_failed" };
     }
     this.active.set(sessionId, { watcher, filePath, agentType: agentType ?? "" });
@@ -1419,10 +1482,17 @@ var TranscriptWatcherManager = class {
   disableMarkdown(sessionId) {
     const session = this.active.get(sessionId);
     if (!session) return;
-    session.watcher.removeSubscriber();
+    const remaining = session.watcher.removeSubscriber();
+    if (remaining > 0) {
+      log5.info("viewer left transcript watcher; other viewers still subscribed", {
+        sessionId,
+        remaining
+      });
+      return;
+    }
     this.active.delete(sessionId);
     this.stopRediscovery(sessionId);
-    console.log(`[rAgent] Stopped watching transcript for ${sessionId}`);
+    log5.info("stopped watching transcript", { sessionId });
   }
   /** Periodically check if the transcript file has changed (new conversation). */
   startRediscovery(sessionId, agentType) {
@@ -1435,7 +1505,7 @@ var TranscriptWatcherManager = class {
       }
       const newPath = discoverTranscriptFile(sessionId, agentType);
       if (!newPath || newPath === session.filePath) return;
-      console.log(`[rAgent] Transcript file changed for ${sessionId}: ${newPath}`);
+      log5.info("transcript file changed", { sessionId, newPath });
       session.watcher.stop();
       const parser = getParser(agentType);
       if (!parser) return;
@@ -1451,14 +1521,14 @@ var TranscriptWatcherManager = class {
             this.sendOpsFn(sessionId, ops, seq);
           } : void 0,
           onError: (error) => {
-            console.warn(`[rAgent] Transcript watcher error (${sessionId}): ${error}`);
+            log5.warn("transcript watcher error", { sessionId, error: String(error) });
           }
         },
         newV2Parser,
         sessionId
       );
       if (!newWatcher.start()) {
-        console.warn(`[rAgent] Failed to start watching new transcript ${newPath}`);
+        log5.warn("failed to start watching new transcript", { newPath });
         return;
       }
       this.sendSnapshotFn(sessionId, [], 0);
@@ -1494,7 +1564,7 @@ var TranscriptWatcherManager = class {
     for (const [sessionId, session] of this.active) {
       session.watcher.stop();
       this.stopRediscovery(sessionId);
-      console.log(`[rAgent] Stopped transcript watcher for ${sessionId}`);
+      log5.info("stopped transcript watcher", { sessionId });
     }
     this.active.clear();
     this.rediscoveryTimers.clear();
@@ -1990,6 +2060,7 @@ async function getChildAgentInfo(parentPid, visited = /* @__PURE__ */ new Set())
 }
 
 // src/auth.ts
+var log6 = createLogger("auth");
 var AuthError = class extends Error {
   constructor(message) {
     super(message);
@@ -2007,7 +2078,7 @@ function decodeJwtExp(token) {
   }
 }
 async function startSessionWithMachineSecret(params) {
-  console.log("[rAgent] Attempting session recovery with machine credential...");
+  log6.info("attempting session recovery with machine credential");
   const response = await fetch(`${params.portal}/api/agent/session/start`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -2040,7 +2111,7 @@ async function startSessionWithMachineSecret(params) {
     patch.refreshExpiresAt = data.refreshExpiresAt || "";
   }
   saveConfigPatch(patch);
-  console.log("[rAgent] Session recovered via machine credential.");
+  log6.info("session recovered via machine credential");
   return data.agentToken;
 }
 async function refreshTokenIfNeeded(params) {
@@ -2049,11 +2120,9 @@ async function refreshTokenIfNeeded(params) {
   const exp = decodeJwtExp(params.agentToken);
   if (!exp) return params.agentToken;
   const remainingSeconds = exp - Math.floor(Date.now() / 1e3);
-  const threshold = remainingSeconds < 3600 ? 120 : 3600;
-  if (remainingSeconds > threshold) return params.agentToken;
-  console.log(
-    `[rAgent] Token expires in ${Math.round(remainingSeconds / 60)}m \u2014 refreshing...`
-  );
+  const threshold2 = remainingSeconds < 3600 ? 120 : 3600;
+  if (remainingSeconds > threshold2) return params.agentToken;
+  log6.info("token expiring \u2014 refreshing", { minutesRemaining: Math.round(remainingSeconds / 60) });
   try {
     const headers = { "Content-Type": "application/json" };
     let body = {};
@@ -2069,9 +2138,7 @@ async function refreshTokenIfNeeded(params) {
     });
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}));
-      console.warn(
-        `[rAgent] Token refresh failed: ${errorData.error || response.status}`
-      );
+      log6.warn("token refresh failed", { error: errorData.error || response.status });
       if (config.machineSecret && config.hostId) {
         try {
           return await startSessionWithMachineSecret({
@@ -2082,7 +2149,7 @@ async function refreshTokenIfNeeded(params) {
         } 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}`);
+          log6.warn("machine credential recovery failed", { error: mcMessage });
         }
       }
       return params.agentToken;
@@ -2101,12 +2168,12 @@ async function refreshTokenIfNeeded(params) {
       patch.machineSecret = data.machineSecret;
     }
     saveConfigPatch(patch);
-    console.log("[rAgent] Token refreshed successfully.");
+    log6.info("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}`);
+    log6.warn("token refresh error", { error: message });
     return params.agentToken;
   }
 }
@@ -2169,7 +2236,7 @@ async function deregisterHost(params) {
     body: JSON.stringify({})
   });
   if (response.status === 401 || response.status === 403) {
-    console.warn("[rAgent] Token expired \u2014 could not deregister from server. Host may remain visible in dashboard until manually removed.");
+    log6.warn("token expired \u2014 could not deregister from server. Host may remain visible in dashboard until manually removed");
     return false;
   }
   return response.ok;
@@ -2275,13 +2342,42 @@ function redactSecrets(str) {
   }
   return result;
 }
+var streamingTails = /* @__PURE__ */ new Map();
+var MAX_STREAMING_TAIL = 1024;
+var SECRET_PREFIX_RE = /(?:AKIA[0-9A-Z]*|gh[ps]_[A-Za-z0-9_]*|sk_(?:live|test)_[A-Za-z0-9]*|eyJ[A-Za-z0-9_-]*(?:\.[A-Za-z0-9_-]*){0,2})$/;
+function redactStreamingChunk(sessionId, chunk) {
+  if (!redactionEnabled) return chunk;
+  const prevTail = streamingTails.get(sessionId) ?? "";
+  const combined = prevTail + chunk;
+  const redacted = redactSecrets(combined);
+  const prefix = SECRET_PREFIX_RE.exec(redacted);
+  if (prefix && prefix.index + prefix[0].length === redacted.length && redacted.length - prefix.index <= MAX_STREAMING_TAIL) {
+    streamingTails.set(sessionId, redacted.slice(prefix.index));
+    return redacted.slice(0, prefix.index);
+  }
+  streamingTails.delete(sessionId);
+  return redacted;
+}
+function flushStreamingRedaction(sessionId) {
+  const tail = streamingTails.get(sessionId) ?? "";
+  streamingTails.delete(sessionId);
+  return redactionEnabled ? redactSecrets(tail) : tail;
+}
 var pendingQueue = [];
 var drainTimer = null;
 var drainWs = null;
 var droppedFrames = 0;
+var PRESSURE_HIGH = 0.75;
+var PRESSURE_LOW = 0.25;
+var pressureIsHigh = false;
+function getQueuePressure() {
+  const level = pendingQueue.length / MAX_PENDING_QUEUE;
+  if (level >= PRESSURE_HIGH) pressureIsHigh = true;
+  else if (level < PRESSURE_LOW) pressureIsHigh = false;
+  return { level, isHigh: pressureIsHigh };
+}
 function drainQueue() {
   if (!drainWs || drainWs.readyState !== import_ws.default.OPEN) {
-    pendingQueue.length = 0;
     stopDrainTimer();
     return;
   }
@@ -2330,6 +2426,7 @@ function sendToGroup(ws, group, data) {
   }
   if (pendingQueue.length > 0) {
     pendingQueue.push(frame);
+    drainWs = ws;
     drainQueue();
     return;
   }
@@ -2362,6 +2459,8 @@ var import_node_path = require("path");
 var import_node_os = require("os");
 var import_node_string_decoder = require("string_decoder");
 var pty = __toESM(require("node-pty"));
+var log7 = createLogger("session-streamer");
+var BACKPRESSURE_RESUME_CHECK_MS = 100;
 var STOP_DEBOUNCE_MS = 2e3;
 var MAX_CONCURRENT_STREAMS = 20;
 var MAX_SESSION_BUFFER_BYTES = 64 * 1024;
@@ -2427,10 +2526,54 @@ var SessionStreamer = class {
    */
   disconnectBuffers = /* @__PURE__ */ new Map();
   disconnectBufferBytes = /* @__PURE__ */ new Map();
+  /** Timer that resumes paused PTYs once the WS queue drains. See #332. */
+  backpressureResumeTimer = null;
   constructor(sendFn, onStreamStopped) {
     this.sendFn = sendFn;
     this.onStreamStopped = onStreamStopped;
     this.cleanupStaleStreams();
+    this.startBackpressureResumeTimer();
+  }
+  /**
+   * When the WS queue is saturated, PTY onData stops firing after we call
+   * ptyProc.pause(). We need an independent loop to check pressure and
+   * resume each paused PTY once the queue drains. See #332.
+   */
+  startBackpressureResumeTimer() {
+    if (this.backpressureResumeTimer) return;
+    this.backpressureResumeTimer = setInterval(() => {
+      const pressure = getQueuePressure();
+      if (pressure.isHigh) return;
+      for (const stream of this.active.values()) {
+        if (stream.ptyPaused && stream.ptyProc && !stream.stopped) {
+          try {
+            stream.ptyProc.resume();
+            stream.ptyPaused = false;
+            log7.info("pty-attach resumed after WS queue drained", { sessionId: stream.sessionId });
+          } catch {
+          }
+        }
+      }
+    }, BACKPRESSURE_RESUME_CHECK_MS);
+  }
+  /**
+   * Pause a PTY-attach stream when WS queue pressure is high. Only applies
+   * to `pty-attach` streams — tmux-pipe (FIFO cat) and process-trace
+   * (strace) don't have a pause primitive in this implementation.
+   */
+  applyBackpressure(stream) {
+    if (stream.streamType !== "pty-attach" || !stream.ptyProc || stream.ptyPaused) return;
+    const pressure = getQueuePressure();
+    if (!pressure.isHigh) return;
+    try {
+      stream.ptyProc.pause();
+      stream.ptyPaused = true;
+      log7.warn("pty-attach paused under WS backpressure", {
+        sessionId: stream.sessionId,
+        queueLevel: pressure.level.toFixed(2)
+      });
+    } catch {
+    }
   }
   /**
    * Remove orphaned FIFO directories left behind by a previous crash.
@@ -2449,7 +2592,7 @@ var SessionStreamer = class {
         }
       }
       if (entries.some((e) => e.startsWith("s-"))) {
-        console.log("[rAgent] Cleaned up stale stream directories from previous run.");
+        log7.info("cleaned up stale stream directories from previous run");
       }
     } catch {
     }
@@ -2467,7 +2610,7 @@ var SessionStreamer = class {
         if (viewerKey) {
           this.active.get(sessionId)?.viewerIds.add(viewerKey);
         }
-        console.log(`[rAgent] Cancelled pending stop for: ${sessionId} (re-mounted)`);
+        log7.info("cancelled pending stop (re-mounted)", { sessionId });
         return true;
       }
     }
@@ -2478,9 +2621,10 @@ var SessionStreamer = class {
       return true;
     }
     if (this.active.size >= MAX_CONCURRENT_STREAMS) {
-      console.warn(
-        `[rAgent] Stream limit reached (${MAX_CONCURRENT_STREAMS}). Rejecting: ${sessionId}`
-      );
+      log7.warn("stream limit reached; rejecting", {
+        limit: MAX_CONCURRENT_STREAMS,
+        sessionId
+      });
       return false;
     }
     if (sessionId.startsWith("tmux:")) {
@@ -2508,7 +2652,7 @@ var SessionStreamer = class {
       stream.ptyProc.write(data);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.warn(`[rAgent] Failed to write input to ${sessionId}: ${message}`);
+      log7.warn("failed to write input", { sessionId, error: message });
     }
   }
   /**
@@ -2522,7 +2666,7 @@ var SessionStreamer = class {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (!message.includes("EBADF")) {
-        console.warn(`[rAgent] Resize failed for ${sessionId}: ${message}`);
+        log7.warn("resize failed", { sessionId, error: message });
       }
     }
   }
@@ -2548,7 +2692,7 @@ var SessionStreamer = class {
       this.active.delete(sessionId);
       this.disconnectBuffers.delete(sessionId);
       this.disconnectBufferBytes.delete(sessionId);
-      console.log(`[rAgent] Stopped streaming: ${sessionId}`);
+      log7.info("stopped streaming", { sessionId });
     }, STOP_DEBOUNCE_MS);
     this.pendingStops.set(sessionId, timer);
   }
@@ -2568,11 +2712,15 @@ var SessionStreamer = class {
     this.pendingStops.clear();
     for (const [id, stream] of this.active) {
       this.cleanupStream(stream);
-      console.log(`[rAgent] Stopped streaming: ${id}`);
+      log7.info("stopped streaming", { sessionId: id });
     }
     this.active.clear();
     this.disconnectBuffers.clear();
     this.disconnectBufferBytes.clear();
+    if (this.backpressureResumeTimer) {
+      clearInterval(this.backpressureResumeTimer);
+      this.backpressureResumeTimer = null;
+    }
   }
   /**
    * Get the number of active streams.
@@ -2608,7 +2756,9 @@ var SessionStreamer = class {
       currentBytes -= Buffer.byteLength(evicted, "utf8");
     }
     if (dataBytes > MAX_SESSION_BUFFER_BYTES) {
-      const tail = data.slice(data.length - MAX_SESSION_BUFFER_BYTES);
+      const buf = Buffer.from(data, "utf8");
+      const tailBuf = buf.subarray(buf.length - MAX_SESSION_BUFFER_BYTES);
+      const tail = tailBuf.toString("utf8");
       chunks.push(tail);
       this.disconnectBufferBytes.set(sessionId, Buffer.byteLength(tail, "utf8"));
       return;
@@ -2695,13 +2845,13 @@ var SessionStreamer = class {
       }
       stream.initializing = false;
       stream.initBuffer = [];
-      console.log(`[rAgent] Resync capture for: ${sessionId}`);
+      log7.info("resync capture", { sessionId });
       return true;
     } catch (error) {
       stream.initializing = false;
       stream.initBuffer = [];
       const message = error instanceof Error ? error.message : String(error);
-      console.warn(`[rAgent] Failed to resync stream for ${sessionId}: ${message}`);
+      log7.warn("failed to resync stream", { sessionId, error: message });
       return false;
     }
   }
@@ -2754,7 +2904,7 @@ var SessionStreamer = class {
       } catch (error) {
         this.cleanupStream(stream);
         const message = error instanceof Error ? error.message : String(error);
-        console.warn(`[rAgent] Failed pipe-pane for ${sessionId}: ${message}`);
+        log7.warn("failed pipe-pane", { sessionId, error: message });
         return false;
       }
       const catProc = (0, import_node_child_process2.spawn)("cat", [fifoPath], { env: cleanEnv, stdio: ["ignore", "pipe", "ignore"] });
@@ -2776,7 +2926,7 @@ var SessionStreamer = class {
           this.cleanupStream(stream);
           this.active.delete(sessionId);
           this.pendingStops.delete(sessionId);
-          console.log(`[rAgent] Session stream ended: ${sessionId}`);
+          log7.info("session stream ended", { sessionId });
           this.onStreamStopped?.(sessionId);
         }
       });
@@ -2836,11 +2986,11 @@ var SessionStreamer = class {
       }
       stream.initializing = false;
       stream.initBuffer = [];
-      console.log(`[rAgent] Started streaming: ${sessionId} (pane: ${paneTarget})`);
+      log7.info("started streaming (tmux)", { sessionId, pane: paneTarget });
       return true;
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.warn(`[rAgent] Failed to start stream for ${sessionId}: ${message}`);
+      log7.warn("failed to start stream", { sessionId, error: message });
       return false;
     }
   }
@@ -2877,6 +3027,7 @@ var SessionStreamer = class {
       proc.onData((data) => {
         if (!stream.stopped) {
           this.sendFn(sessionId, data);
+          this.applyBackpressure(stream);
         }
       });
       proc.onExit(() => {
@@ -2884,15 +3035,15 @@ var SessionStreamer = class {
           stream.stopped = true;
           this.active.delete(sessionId);
           this.pendingStops.delete(sessionId);
-          console.log(`[rAgent] Session stream ended: ${sessionId}`);
+          log7.info("session stream ended", { sessionId });
           this.onStreamStopped?.(sessionId);
         }
       });
-      console.log(`[rAgent] Started streaming: ${sessionId} (screen: ${sessionName})`);
+      log7.info("started streaming (screen)", { sessionId, screen: sessionName });
       return true;
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.warn(`[rAgent] Failed to start screen stream for ${sessionId}: ${message}`);
+      log7.warn("failed to start screen stream", { sessionId, error: message });
       return false;
     }
   }
@@ -2929,6 +3080,7 @@ var SessionStreamer = class {
       proc.onData((data) => {
         if (!stream.stopped) {
           this.sendFn(sessionId, data);
+          this.applyBackpressure(stream);
         }
       });
       proc.onExit(() => {
@@ -2936,15 +3088,15 @@ var SessionStreamer = class {
           stream.stopped = true;
           this.active.delete(sessionId);
           this.pendingStops.delete(sessionId);
-          console.log(`[rAgent] Session stream ended: ${sessionId}`);
+          log7.info("session stream ended", { sessionId });
           this.onStreamStopped?.(sessionId);
         }
       });
-      console.log(`[rAgent] Started streaming: ${sessionId} (zellij: ${sessionName})`);
+      log7.info("started streaming (zellij)", { sessionId, zellij: sessionName });
       return true;
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.warn(`[rAgent] Failed to start zellij stream for ${sessionId}: ${message}`);
+      log7.warn("failed to start zellij stream", { sessionId, error: message });
       return false;
     }
   }
@@ -2955,14 +3107,14 @@ var SessionStreamer = class {
     const pid = parseProcessPid2(sessionId);
     if (!pid) return false;
     if (!(0, import_node_fs.existsSync)(`/proc/${pid}`)) {
-      console.warn(`[rAgent] Process ${pid} does not exist (no /proc/${pid}).`);
+      log7.warn("process does not exist (no /proc entry)", { pid });
       this.sendFn(sessionId, "\r\n[rAgent] Process is no longer running. It will be removed on next sync.\r\n");
       return false;
     }
     try {
       const stat = (0, import_node_fs.readFileSync)(`/proc/${pid}/stat`, "utf8");
       if (stat.includes(") Z")) {
-        console.warn(`[rAgent] Process ${pid} is a zombie.`);
+        log7.warn("process is a zombie", { pid });
         this.sendFn(sessionId, "\r\n[rAgent] Process has exited (zombie). It will be removed on next sync.\r\n");
         return false;
       }
@@ -3035,14 +3187,14 @@ var SessionStreamer = class {
         stream.stopped = true;
         this.active.delete(sessionId);
         this.pendingStops.delete(sessionId);
-        console.log(`[rAgent] Session stream ended: ${sessionId}`);
+        log7.info("session stream ended", { sessionId });
         this.onStreamStopped?.(sessionId);
       });
-      console.log(`[rAgent] Started streaming: ${sessionId} (strace PID: ${pid})`);
+      log7.info("started streaming (process trace)", { sessionId, pid });
       return true;
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.warn(`[rAgent] Failed to start process stream for ${sessionId}: ${message}`);
+      log7.warn("failed to start process stream", { sessionId, error: message });
       return false;
     }
   }
@@ -3093,25 +3245,34 @@ var SessionStreamer = class {
 
 // src/crypto-channel.ts
 var import_node_crypto = require("crypto");
+var log8 = createLogger("crypto-channel");
+var AAD_BYTES = 4;
 function deriveAesKey(sessionKey) {
   return Buffer.from(sessionKey.slice(0, 64), "hex");
 }
-function encryptPayload(data, sessionKey) {
+function seqToAad(seq) {
+  if (!Number.isInteger(seq) || seq < 0 || seq > 4294967295) {
+    throw new Error(`Invalid seq ${seq}: must be a UInt32`);
+  }
+  const buf = Buffer.alloc(AAD_BYTES);
+  buf.writeUInt32BE(seq, 0);
+  return buf;
+}
+function encryptPayload(data, sessionKey, seq) {
   const key = deriveAesKey(sessionKey);
   const iv = (0, import_node_crypto.randomBytes)(12);
   const cipher = (0, import_node_crypto.createCipheriv)("aes-256-gcm", key, iv);
-  const encrypted = Buffer.concat([
-    cipher.update(data, "utf-8"),
-    cipher.final()
-  ]);
+  cipher.setAAD(seqToAad(seq));
+  const encrypted = Buffer.concat([cipher.update(data, "utf-8"), cipher.final()]);
   const authTag = cipher.getAuthTag();
   const combined = Buffer.concat([encrypted, authTag]);
   return {
     enc: combined.toString("base64"),
-    iv: iv.toString("base64")
+    iv: iv.toString("base64"),
+    seq
   };
 }
-function decryptPayload(enc, iv, sessionKey) {
+function decryptPayload(enc, iv, sessionKey, seq) {
   try {
     const key = deriveAesKey(sessionKey);
     const ivBuf = Buffer.from(iv, "base64");
@@ -3120,20 +3281,47 @@ function decryptPayload(enc, iv, sessionKey) {
     const ciphertext = combined.subarray(0, combined.length - 16);
     const authTag = combined.subarray(combined.length - 16);
     const decipher = (0, import_node_crypto.createDecipheriv)("aes-256-gcm", key, ivBuf);
+    decipher.setAAD(seqToAad(seq));
     decipher.setAuthTag(authTag);
-    const decrypted = Buffer.concat([
-      decipher.update(ciphertext),
-      decipher.final()
-    ]);
+    const decrypted = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
     return decrypted.toString("utf-8");
-  } catch {
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    log8.warn("decrypt failed", { seq, encBytes: enc.length, error: message });
     return null;
   }
 }
+var SequenceTracker = class {
+  last = 0;
+  /** Sender: produce the next outgoing seq. */
+  next() {
+    if (this.last >= 4294967295) {
+      throw new Error("Sequence counter overflow; channel must re-handshake.");
+    }
+    this.last += 1;
+    return this.last;
+  }
+  /** Receiver: accept if strictly greater than last-seen; else reject. */
+  accept(seq) {
+    if (!Number.isInteger(seq) || seq < 1 || seq > 4294967295) return false;
+    if (seq <= this.last) return false;
+    this.last = seq;
+    return true;
+  }
+  /** Reset to zero (call on new handshake / sessionKey change). */
+  reset() {
+    this.last = 0;
+  }
+  /** Inspect the last-seen seq (0 means "nothing yet"). */
+  get lastSeq() {
+    return this.last;
+  }
+};
 
 // src/pty.ts
 var import_node_child_process3 = require("child_process");
 var pty2 = __toESM(require("node-pty"));
+var log9 = createLogger("pty");
 function isInteractiveShell(command) {
   const trimmed = String(command).trim();
   return ["bash", "sh", "zsh", "fish"].includes(trimmed);
@@ -3166,7 +3354,7 @@ async function sendInputToTmux(sessionId, data) {
   if (!target) return;
   const sessionName = target.split(":")[0].split(".")[0];
   if (!/^[a-zA-Z0-9_][a-zA-Z0-9_.-]*$/.test(sessionName)) {
-    console.warn(`[rAgent] Invalid tmux session name: ${sessionName}`);
+    log9.warn("invalid tmux session name", { sessionName });
     return;
   }
   try {
@@ -3178,7 +3366,7 @@ async function sendInputToTmux(sessionId, data) {
     });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    console.warn(`[rAgent] Failed to send input to ${sessionId}: ${message}`);
+    log9.warn("failed to send input", { sessionId, error: message });
   }
 }
 async function stopAllDetachedTmuxSessions() {
@@ -3206,6 +3394,7 @@ async function stopAllDetachedTmuxSessions() {
 }
 
 // src/shell-manager.ts
+var log10 = createLogger("shell");
 var ShellManager = class {
   ptyProcess = null;
   suppressNextRespawn = false;
@@ -3246,7 +3435,7 @@ var ShellManager = class {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (!message.includes("EBADF")) {
-        console.warn(`[rAgent] Resize failed: ${message}`);
+        log10.warn("resize failed", { error: message });
       }
     }
   }
@@ -3262,7 +3451,7 @@ var ShellManager = class {
         return;
       }
       if (!this.shouldRun) return;
-      console.warn("[rAgent] Shell exited. Restarting shell process.");
+      log10.warn("shell exited; restarting shell process");
       setTimeout(() => {
         if (this.shouldRun) this.spawnOrRespawn();
       }, 200);
@@ -3368,6 +3557,7 @@ var InventoryManager = class {
 
 // src/connection-manager.ts
 var import_ws3 = __toESM(require("ws"));
+var log11 = createLogger("connection");
 var OPPORTUNISTIC_INVENTORY_SYNC_MS = 1200;
 var MIN_INVENTORY_SYNC_GAP_MS = 1500;
 var ConnectionManager = class {
@@ -3375,6 +3565,31 @@ var ConnectionManager = class {
   activeGroups = { privateGroup: "", registryGroup: "" };
   sessionKey = null;
   reconnectDelay = DEFAULT_RECONNECT_DELAY_MS;
+  /** Outbound frame counter; reset on every new handshake. See #310. */
+  txSeq = new SequenceTracker();
+  /**
+   * Inbound frame trackers, keyed by viewerId. The portal's Terminal.tsx
+   * initializes a fresh txSeq (starting at 1) on every component mount, so a
+   * browser refresh — or a second viewer joining — cannot reuse the tracker
+   * state of a prior session without triggering replay rejection. See #392.
+   * A reserved `_legacy` key catches frames from pre-viewerId clients.
+   */
+  rxSeqByViewer = /* @__PURE__ */ new Map();
+  /**
+   * Fetch (or lazily create) the inbound sequence tracker for `viewerId`.
+   * Untrusted input: an empty or missing viewerId falls back to `_legacy`,
+   * which preserves compatibility with older portal builds that didn't send
+   * the field.
+   */
+  getRxSeqForViewer(viewerId) {
+    const key = typeof viewerId === "string" && viewerId.length > 0 ? viewerId : "_legacy";
+    let tracker = this.rxSeqByViewer.get(key);
+    if (!tracker) {
+      tracker = new SequenceTracker();
+      this.rxSeqByViewer.set(key, tracker);
+    }
+    return tracker;
+  }
   wsHeartbeatTimer = null;
   inventorySyncTimer = null;
   inventorySyncKickTimer = null;
@@ -3399,6 +3614,10 @@ var ConnectionManager = class {
   setConnection(ws, groups, sessionKey) {
     this.activeSocket = ws;
     this.activeGroups = groups;
+    if (sessionKey !== this.sessionKey) {
+      this.txSeq.reset();
+      this.rxSeqByViewer.clear();
+    }
     this.sessionKey = sessionKey;
   }
   /** Reset reconnect delay on successful connection. */
@@ -3421,7 +3640,7 @@ var ConnectionManager = class {
       if (!this.activeSocket || this.activeSocket.readyState !== import_ws3.default.OPEN) return;
       this.activeSocket.ping();
       this.wsPongTimeout = setTimeout(() => {
-        console.warn("[rAgent] No pong received within 10s \u2014 closing stale connection.");
+        log11.warn("no pong received within 10s; closing stale connection");
         try {
           this.activeSocket?.terminate();
         } catch {
@@ -3510,9 +3729,10 @@ var ConnectionManager = class {
   replayBufferedOutput(sendChunk) {
     const buffered = this.outputBuffer.drain();
     if (buffered.length > 0) {
-      console.log(
-        `[rAgent] Replaying ${buffered.length} buffered output chunks (${buffered.reduce((sum, c) => sum + Buffer.byteLength(c, "utf8"), 0)} bytes)`
-      );
+      log11.info("replaying buffered output chunks", {
+        chunks: buffered.length,
+        bytes: buffered.reduce((sum, c) => sum + Buffer.byteLength(c, "utf8"), 0)
+      });
       for (const chunk of buffered) {
         sendChunk(chunk);
       }
@@ -3548,6 +3768,7 @@ var import_child_process3 = require("child_process");
 var fs4 = __toESM(require("fs"));
 var os7 = __toESM(require("os"));
 var path3 = __toESM(require("path"));
+var log12 = createLogger("service");
 function assertConfiguredAgentToken() {
   const config = loadConfig();
   if (!config.agentToken) {
@@ -3613,7 +3834,7 @@ async function installSystemdService(opts = {}) {
     await runSystemctlUser(["restart", SERVICE_NAME]);
   }
   saveConfigPatch({ serviceBackend: "systemd" });
-  console.log(`[rAgent] Installed systemd user service at ${SERVICE_FILE}`);
+  log12.info("installed systemd user service", { path: SERVICE_FILE });
 }
 function readFallbackPid() {
   try {
@@ -3652,7 +3873,7 @@ async function startPidfileService() {
   assertConfiguredAgentToken();
   const existingPid = readFallbackPid();
   if (existingPid && isProcessRunning(existingPid)) {
-    console.log(`[rAgent] Service already running (pid ${existingPid})`);
+    log12.info("service already running", { pid: existingPid });
     return;
   }
   ensureConfigDir();
@@ -3669,8 +3890,8 @@ async function startPidfileService() {
   fs4.writeFileSync(FALLBACK_PID_FILE, `${child.pid}
 `, "utf8");
   saveConfigPatch({ serviceBackend: "pidfile" });
-  console.log(`[rAgent] Started fallback background service (pid ${child.pid})`);
-  console.log(`[rAgent] Logs: ${FALLBACK_LOG_FILE}`);
+  log12.info("started fallback background service", { pid: child.pid });
+  log12.info("logs", { path: FALLBACK_LOG_FILE });
 }
 async function stopPidfileService() {
   const pid = readFallbackPid();
@@ -3679,7 +3900,7 @@ async function stopPidfileService() {
       fs4.unlinkSync(FALLBACK_PID_FILE);
     } catch {
     }
-    console.log("[rAgent] Service is not running.");
+    log12.info("service is not running");
     return;
   }
   process.kill(pid, "SIGTERM");
@@ -3694,7 +3915,7 @@ async function stopPidfileService() {
     fs4.unlinkSync(FALLBACK_PID_FILE);
   } catch {
   }
-  console.log(`[rAgent] Stopped fallback background service (pid ${pid})`);
+  log12.info("stopped fallback background service", { pid });
 }
 async function ensureServiceInstalled(opts = {}) {
   const wantsSystemd = await canUseSystemdUser();
@@ -3706,9 +3927,7 @@ async function ensureServiceInstalled(opts = {}) {
   if (opts.start) {
     await startPidfileService();
   } else {
-    console.log(
-      "[rAgent] systemd user manager unavailable; using fallback pidfile backend."
-    );
+    log12.info("systemd user manager unavailable; using fallback pidfile backend");
   }
   return "pidfile";
 }
@@ -3716,7 +3935,7 @@ async function startService() {
   const backend = getConfiguredServiceBackend();
   if (backend === "systemd") {
     await runSystemctlUser(["start", SERVICE_NAME]);
-    console.log("[rAgent] Started service via systemd.");
+    log12.info("started service via systemd");
     return;
   }
   if (backend === "pidfile") {
@@ -3729,7 +3948,7 @@ async function stopService() {
   const backend = getConfiguredServiceBackend();
   if (backend === "systemd") {
     await runSystemctlUser(["stop", SERVICE_NAME]);
-    console.log("[rAgent] Stopped service via systemd.");
+    log12.info("stopped service via systemd");
     return;
   }
   await stopPidfileService();
@@ -3747,7 +3966,7 @@ function killStaleAgentProcesses() {
         try {
           process.kill(pid, 0);
           process.kill(pid, "SIGTERM");
-          console.log(`[rAgent] Stopped stale agent process (pid ${pid})`);
+          log12.info("stopped stale agent process", { pid });
         } catch {
         }
         fs4.unlinkSync(pidPath);
@@ -3762,7 +3981,7 @@ async function restartService() {
   killStaleAgentProcesses();
   if (backend === "systemd") {
     await runSystemctlUser(["restart", SERVICE_NAME]);
-    console.log("[rAgent] Restarted service via systemd.");
+    log12.info("restarted service via systemd");
     return;
   }
   await stopPidfileService();
@@ -3778,17 +3997,17 @@ async function printServiceStatus() {
     if (status) {
       process.stdout.write(status);
     } else {
-      console.log("[rAgent] systemd service is not installed or has no status.");
+      log12.info("systemd service is not installed or has no status");
     }
     return;
   }
   const pid = readFallbackPid();
   if (pid && isProcessRunning(pid)) {
-    console.log(`[rAgent] fallback service running (pid ${pid})`);
-    console.log(`[rAgent] logs: ${FALLBACK_LOG_FILE}`);
+    log12.info("fallback service running", { pid });
+    log12.info("logs", { path: FALLBACK_LOG_FILE });
     return;
   }
-  console.log("[rAgent] service is not running.");
+  log12.info("service is not running");
 }
 async function printServiceLogs(opts) {
   const lines = Number.parseInt(String(opts.lines || 100), 10) || 100;
@@ -3814,7 +4033,7 @@ async function printServiceLogs(opts) {
     return;
   }
   if (!fs4.existsSync(FALLBACK_LOG_FILE)) {
-    console.log(`[rAgent] No log file found at ${FALLBACK_LOG_FILE}`);
+    log12.info("no log file found", { path: FALLBACK_LOG_FILE });
     return;
   }
   if (follow) {
@@ -3846,7 +4065,7 @@ async function uninstallService() {
   const config = loadConfig();
   delete config.serviceBackend;
   saveConfig(config);
-  console.log("[rAgent] Service uninstalled.");
+  log12.info("service uninstalled");
 }
 function requestStopSelfService() {
   const backend = getConfiguredServiceBackend();
@@ -4071,7 +4290,105 @@ async function executeProvision(request, onProgress) {
   return startAgent(request, emit);
 }
 
+// src/command-guard.ts
+var import_node_path2 = require("path");
+var posixNormalize = import_node_path2.posix.normalize;
+var PATTERNS = [
+  // Any command/expression substitution. Legitimate agent launchers never
+  // need these — forbidding them blocks smuggled commands like
+  // `claude $(rm -rf /)` or `aider `rm -rf /``.
+  {
+    category: "subshell_expansion",
+    re: /\$\(|`/,
+    pattern: "subshell expansion $(...) or backticks"
+  },
+  // Download-and-pipe-to-shell: `curl … | sh`, `wget … | bash`, etc.
+  {
+    category: "pipe_to_shell",
+    re: /\b(?:curl|wget|fetch|lwp-request)\b[^\n]{0,400}?\|[^\n]{0,100}?\b(?:sh|bash|zsh|fish|dash|ksh|csh|tcsh|ash)\b/i,
+    pattern: "curl/wget piped into a shell"
+  },
+  // base64 → decode → shell.
+  {
+    category: "base64_pipe",
+    re: /\bbase64\b[^\n]{0,200}?(?:-d|--decode)\b[^\n]{0,400}?\|[^\n]{0,100}?\b(?:sh|bash|zsh|fish|dash)\b/i,
+    pattern: "base64 decode piped into a shell"
+  },
+  // `rm -rf /`, `rm -r ~`, `rm -rf *`, `rm -fr $HOME`, etc.
+  // Matches -r, -R, -f, -e in any order/combination.
+  {
+    category: "rm_dangerous_target",
+    re: /\brm\b(?:\s+-[a-zA-Z]*[rRfe][a-zA-Z]*){1,4}\s+(?:\/(?:\s|$)|~(?:\s|$|\/)|\$HOME\b|\*\s*$|\*\s+|\.{1,2}\s*$)/i,
+    pattern: "rm against /, ~, $HOME, *, or ."
+  },
+  // mkfs.ext4, mkfs.btrfs, plain mkfs, etc.
+  {
+    category: "mkfs",
+    re: /\bmkfs(?:\.[a-z0-9]+)?\b/i,
+    pattern: "mkfs* filesystem format"
+  },
+  // dd of=/dev/sda, dd of=/dev/nvme0n1, etc.
+  {
+    category: "dd_write_device",
+    re: /\bdd\b[^\n|&;]{0,300}?\bof=\/dev\/[a-z]/i,
+    pattern: "dd writing to a block device"
+  },
+  // Shell redirects writing to block devices.
+  {
+    category: "write_device",
+    re: />\s*\/dev\/(?:sd|nvme|hd|mmc|xvd|disk|loop)/i,
+    pattern: "redirect to a block device"
+  },
+  // Classic fork bomb :(){ :|: & };:
+  // Whitespace-tolerant; covers `:() { :|: & };:` variants.
+  {
+    category: "fork_bomb",
+    re: /:\s*\(\s*\)\s*\{[^}]*:\s*\|\s*:\s*&\s*;?\s*\}\s*;?\s*:/,
+    pattern: "fork bomb definition"
+  },
+  // chmod -R 7xx / (world-writable on root).
+  {
+    category: "chmod_permissive_root",
+    re: /\bchmod\b(?:\s+-[rR]+)?\s+[0-7]*7[0-7]*\s+\/(?:\s|$)/i,
+    pattern: "chmod with permissive perms on /"
+  },
+  // chown … /
+  {
+    category: "chown_root",
+    re: /\bchown\b(?:\s+-[rR]+)?\s+\S+\s+\/(?:\s|$)/i,
+    pattern: "chown targeting /"
+  },
+  // ln -s … /dev/… — creating symlinks into /dev lets later redirects hit
+  // device nodes through a benign-looking relative path.
+  {
+    category: "symlink_to_device",
+    re: /\bln\b\s+-[^\s]*s[^\s]*\s+\/dev\//i,
+    pattern: "ln -s into /dev"
+  },
+  // Host-level power actions.
+  {
+    category: "shutdown",
+    re: /\b(?:shutdown|reboot|halt|poweroff|kexec)\b/i,
+    pattern: "shutdown/reboot/halt/poweroff/kexec"
+  }
+];
+function detectDangerousCommand(cmd) {
+  if (typeof cmd !== "string" || cmd.length === 0) return null;
+  for (const { category, re, pattern } of PATTERNS) {
+    if (re.test(cmd)) return { category, pattern };
+  }
+  return null;
+}
+function isSafeWorkingDir(raw) {
+  if (typeof raw !== "string" || raw.length === 0) return false;
+  if (!raw.startsWith("/")) return false;
+  const normalized = posixNormalize(raw);
+  if (normalized === "/dev" || normalized.startsWith("/dev/")) return false;
+  return true;
+}
+
 // src/control-dispatcher.ts
+var log13 = createLogger("control");
 function collectProcessTreePids(rootPid, visited = /* @__PURE__ */ new Set()) {
   if (visited.has(rootPid)) return [];
   visited.add(rootPid);
@@ -4153,11 +4470,11 @@ var ControlDispatcher = class {
     if (!sessionKey) return true;
     const receivedHmac = payload.hmac;
     if (typeof receivedHmac !== "string") {
-      console.warn("[rAgent] Control message missing HMAC signature.");
+      log13.warn("control message missing HMAC signature");
       return false;
     }
     if (!/^[0-9a-f]{64}$/i.test(receivedHmac)) {
-      console.warn("[rAgent] Control message has malformed HMAC signature.");
+      log13.warn("control message has malformed HMAC signature");
       return false;
     }
     const { hmac: _, ...payloadWithoutHmac } = payload;
@@ -4183,7 +4500,7 @@ var ControlDispatcher = class {
     ]);
     if (dangerousActions.has(action) && this.connection.sessionKey) {
       if (!this.verifyMessageHmac(payload)) {
-        console.warn(`[rAgent] Rejecting control action "${action}" \u2014 HMAC verification failed.`);
+        log13.warn("rejecting control action \u2014 HMAC verification failed", { action });
         return;
       }
     }
@@ -4219,10 +4536,10 @@ var ControlDispatcher = class {
           this.transcriptWatcher?.disableMarkdown(sessionId);
           try {
             await stopTmuxPaneBySessionId(sessionId);
-            console.log(`[rAgent] Closed remote session ${sessionId}.`);
+            log13.info("closed remote session", { sessionId });
           } catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            console.warn(`[rAgent] Failed to close ${sessionId}: ${message}`);
+            log13.warn("failed to close session", { sessionId, error: message });
           }
           await delay(300);
           await this.syncInventory(true);
@@ -4233,7 +4550,7 @@ var ControlDispatcher = class {
         {
           const pid = parseProcessPid2(sessionId);
           if (pid === null) {
-            console.warn(`[rAgent] kill-process: could not parse PID from ${sessionId}`);
+            log13.warn("kill-process: could not parse PID", { sessionId });
             return;
           }
           this.transcriptWatcher?.disableMarkdown(sessionId);
@@ -4249,11 +4566,11 @@ var ControlDispatcher = class {
                 const code = error.code;
                 if (code !== "ESRCH") {
                   const message = error instanceof Error ? error.message : String(error);
-                  console.warn(`[rAgent] Failed to send SIGTERM to process ${targetPid}: ${message}`);
+                  log13.warn("failed to send SIGTERM", { pid: targetPid, error: message });
                 }
               }
             }
-            console.log(`[rAgent] Sent SIGTERM to ${signaled} process(es) for ${sessionId}.`);
+            log13.info("sent SIGTERM to processes", { signaled, sessionId });
             await new Promise((resolve) => setTimeout(resolve, 1500));
             for (const targetPid of processTree) {
               if (!isProcessAlive(targetPid)) continue;
@@ -4263,13 +4580,13 @@ var ControlDispatcher = class {
                 const code = error.code;
                 if (code !== "ESRCH") {
                   const message = error instanceof Error ? error.message : String(error);
-                  console.warn(`[rAgent] Failed to send SIGKILL to process ${targetPid}: ${message}`);
+                  log13.warn("failed to send SIGKILL", { pid: targetPid, error: message });
                 }
               }
             }
           } catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            console.warn(`[rAgent] Failed to kill ${sessionId}: ${message}`);
+            log13.warn("failed to kill session", { sessionId, error: message });
           }
           await this.syncInventory(true);
         }
@@ -4284,7 +4601,7 @@ var ControlDispatcher = class {
           }
         }
         const killed = await stopAllDetachedTmuxSessions();
-        console.log(`[rAgent] Killed ${killed} detached tmux session(s).`);
+        log13.info("killed detached tmux sessions", { count: killed });
         await delay(300);
         await this.syncInventory(true);
         return;
@@ -4340,10 +4657,10 @@ var ControlDispatcher = class {
   async handleProvision(payload) {
     const provReq = validateProvisionRequest(payload);
     if (!provReq) {
-      console.warn("[rAgent] Rejecting provision request \u2014 malformed payload.");
+      log13.warn("rejecting provision request \u2014 malformed payload");
       return;
     }
-    console.log(`[rAgent] Provision request: ${provReq.manifest.name} (${provReq.provisionId})`);
+    log13.info("provision request", { name: provReq.manifest.name, provisionId: provReq.provisionId });
     const sendProgress = (progress) => {
       const ws = this.connection.activeSocket;
       if (ws && ws.readyState === import_ws4.default.OPEN && this.connection.activeGroups.registryGroup) {
@@ -4380,7 +4697,7 @@ var ControlDispatcher = class {
           status: "unavailable",
           reason: result.reason
         });
-        console.log(`[rAgent] Could not enable markdown for ${sessionId}: ${result.reason}`);
+        log13.info("could not enable markdown", { sessionId, reason: result.reason });
       } else {
         this.sendMarkdownStatus({
           type: "markdown",
@@ -4397,7 +4714,7 @@ var ControlDispatcher = class {
     const ws = this.connection.activeSocket;
     const group = this.connection.activeGroups.privateGroup;
     if (!ws || ws.readyState !== import_ws4.default.OPEN || !group) return;
-    sendToGroup(ws, group, payload);
+    sendToGroup(ws, group, { ...payload });
   }
   /** Stop all transcript watchers (called on disconnect/cleanup). */
   stopTranscriptWatchers() {
@@ -4414,19 +4731,59 @@ var ControlDispatcher = class {
     const sessionName = typeof payload?.sessionName === "string" && payload.sessionName.trim().length > 0 ? payload.sessionName.trim() : `agent-${Date.now().toString(36)}`;
     const cmd = typeof payload?.command === "string" && payload.command.trim().length > 0 ? payload.command.trim() : null;
     if (!cmd) {
-      console.warn("[rAgent] start-agent: no command provided, ignoring.");
+      log13.warn("start-agent: no command provided, ignoring");
       return;
     }
     if (sessionName.length > 128 || !/^[a-zA-Z0-9_-]+$/.test(sessionName)) {
-      console.warn("[rAgent] start-agent: invalid session name, ignoring.");
+      log13.warn("start-agent: invalid session name, ignoring");
       return;
     }
-    const dangerous = /rm\s+-r[fe]*\s+\/|mkfs|dd\s+if=|:()\s*\{|>\s*\/dev\/sd/i;
-    if (dangerous.test(cmd)) {
-      console.warn(`[rAgent] start-agent: rejected dangerous command: ${cmd}`);
+    const danger = detectDangerousCommand(cmd);
+    if (danger) {
+      if (!this._approvalEnforcer) {
+        log13.warn("start-agent: rejected dangerous command (no approval enforcer)", {
+          category: danger.category,
+          pattern: danger.pattern,
+          command: cmd
+        });
+        return;
+      }
+      log13.info("start-agent: dangerous command \u2014 awaiting approval", {
+        category: danger.category,
+        pattern: danger.pattern,
+        sessionName
+      });
+      const response = await this._approvalEnforcer.checkCommand(
+        cmd,
+        this.options.hostId,
+        sessionName
+      );
+      if (response === null) {
+        log13.warn("start-agent: dangerous command not covered by approval policy, rejecting", {
+          category: danger.category,
+          command: cmd
+        });
+        return;
+      }
+      if (response.type !== "approved") {
+        log13.warn("start-agent: dangerous command denied or timed out", {
+          category: danger.category,
+          sessionName,
+          responseType: response.type
+        });
+        return;
+      }
+      log13.info("start-agent: dangerous command approved", {
+        category: danger.category,
+        sessionName
+      });
+    }
+    const rawWorkingDir = typeof payload?.workingDir === "string" && payload.workingDir.trim().length > 0 ? payload.workingDir.trim() : void 0;
+    if (rawWorkingDir !== void 0 && !isSafeWorkingDir(rawWorkingDir)) {
+      log13.warn("start-agent: rejected unsafe workingDir", { workingDir: rawWorkingDir });
       return;
     }
-    const workingDir = typeof payload?.workingDir === "string" && payload.workingDir.trim().length > 0 ? payload.workingDir.trim() : void 0;
+    const workingDir = rawWorkingDir;
     const envVars = payload?.envVars && typeof payload.envVars === "object" ? payload.envVars : void 0;
     const tmuxArgs = ["new-session", "-d", "-s", sessionName];
     if (workingDir) {
@@ -4440,10 +4797,10 @@ var ControlDispatcher = class {
     tmuxArgs.push(fullCmd);
     try {
       (0, import_child_process5.execFileSync)("tmux", tmuxArgs, { stdio: "ignore" });
-      console.log(`[rAgent] Started agent session "${sessionName}": ${cmd}`);
+      log13.info("started agent session", { sessionName, command: cmd });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Failed to start agent session "${sessionName}": ${message}`);
+      log13.error("failed to start agent session", { sessionName, error: message });
     }
     await this.syncInventory(true);
   }
@@ -4706,6 +5063,7 @@ function isGrantExpired(grant) {
 }
 
 // src/approval-enforcer.ts
+var log14 = createLogger("approval");
 var ApprovalEnforcer = class {
   policy;
   secret;
@@ -4729,16 +5087,20 @@ var ApprovalEnforcer = class {
   async checkCommand(command, hostId, sessionId) {
     const request = matchPolicy(command, this.policy, hostId, sessionId);
     if (!request) return null;
-    console.log(
-      `[rAgent] Approval: ${request.action} (${request.severity}) \u2014 pending [${request.requestId}]`
-    );
+    log14.info("approval pending", {
+      action: request.action,
+      severity: request.severity,
+      requestId: request.requestId
+    });
     return new Promise((resolve) => {
       const timer = setTimeout(() => {
         this.pendingRequests.delete(request.requestId);
         const response = { type: "timeout" };
-        console.log(
-          `[rAgent] Approval: ${request.action} (${request.severity}) \u2014 timeout [${request.requestId}]`
-        );
+        log14.info("approval timeout", {
+          action: request.action,
+          severity: request.severity,
+          requestId: request.requestId
+        });
         resolve(response);
       }, request.timeoutMs);
       this.pendingRequests.set(request.requestId, { request, resolve, timer });
@@ -4754,29 +5116,33 @@ var ApprovalEnforcer = class {
     if (!requestId) return;
     const pending = this.pendingRequests.get(requestId);
     if (!pending) {
-      console.warn(
-        `[rAgent] Approval: received response for unknown request [${requestId}]`
-      );
+      log14.warn("received response for unknown approval request", { requestId });
       return;
     }
     if (response.type === "approved") {
       if (!this.acceptGrant(response.grant)) {
-        console.log(
-          `[rAgent] Approval: ${pending.request.action} (${pending.request.severity}) \u2014 rejected (invalid grant) [${requestId}]`
-        );
+        log14.info("approval rejected (invalid grant)", {
+          action: pending.request.action,
+          severity: pending.request.severity,
+          requestId
+        });
         clearTimeout(pending.timer);
         this.pendingRequests.delete(requestId);
         pending.resolve({ type: "denied", denial: { requestId, deniedBy: "system", deniedAt: (/* @__PURE__ */ new Date()).toISOString(), reason: "Invalid or expired grant" } });
         return;
       }
-      console.log(
-        `[rAgent] Approval: ${pending.request.action} (${pending.request.severity}) \u2014 approved [${requestId}]`
-      );
+      log14.info("approval approved", {
+        action: pending.request.action,
+        severity: pending.request.severity,
+        requestId
+      });
     } else if (response.type === "denied") {
-      const reason = response.denial.reason ? ` (${response.denial.reason})` : "";
-      console.log(
-        `[rAgent] Approval: ${pending.request.action} (${pending.request.severity}) \u2014 denied${reason} [${requestId}]`
-      );
+      log14.info("approval denied", {
+        action: pending.request.action,
+        severity: pending.request.severity,
+        requestId,
+        reason: response.denial.reason ?? ""
+      });
     }
     clearTimeout(pending.timer);
     this.pendingRequests.delete(requestId);
@@ -4812,9 +5178,11 @@ var ApprovalEnforcer = class {
     for (const [id, entry] of this.pendingRequests) {
       clearTimeout(entry.timer);
       this.pendingRequests.delete(id);
-      console.log(
-        `[rAgent] Approval: ${entry.request.action} (${entry.request.severity}) \u2014 stopped [${id}]`
-      );
+      log14.info("approval stopped", {
+        action: entry.request.action,
+        severity: entry.request.severity,
+        requestId: id
+      });
       entry.resolve({ type: "timeout" });
     }
   }
@@ -4839,6 +5207,7 @@ var ApprovalEnforcer = class {
 };
 
 // src/agent.ts
+var log15 = createLogger("agent");
 var MAX_TRANSPORT_CHUNK_BYTES = 24 * 1024;
 function pidFilePath(hostId) {
   return path4.join(CONFIG_DIR, `agent-${hostId}.pid`);
@@ -4923,15 +5292,15 @@ async function runAgent(rawOptions) {
   const config = loadConfig();
   if (config.redaction?.enabled === false || rawOptions.redact === false) {
     setRedactionEnabled(false);
-    console.log("[rAgent] Secret redaction disabled.");
+    log15.info("secret redaction disabled");
   }
-  console.log(`[rAgent] Connector started for ${options.hostName} (${options.hostId})`);
-  console.log(`[rAgent] Portal: ${options.portal}`);
+  log15.info("connector started", { hostName: options.hostName, hostId: options.hostId });
+  log15.info("portal", { portal: options.portal });
   try {
     const existingSessions = await collectSessionInventory(options.hostId, options.command);
     const tmuxCount = existingSessions.filter((s) => s.type === "tmux").length;
     if (tmuxCount > 0) {
-      console.log(`[rAgent] Found ${tmuxCount} existing tmux session(s) on this machine.`);
+      log15.info("found existing tmux sessions", { count: tmuxCount });
     }
   } catch {
   }
@@ -4944,16 +5313,26 @@ async function runAgent(rawOptions) {
         sessionStreamer.bufferOutput(sessionId, data);
         return;
       }
-      for (const chunk of splitTransportChunks(data)) {
+      const redactedData = redactStreamingChunk(sessionId, data);
+      for (const chunk of splitTransportChunks(redactedData)) {
         if (conn.sessionKey) {
-          const { enc, iv } = encryptPayload(chunk, conn.sessionKey);
-          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", enc, iv, sessionId });
+          const { enc, iv, seq } = encryptPayload(chunk, conn.sessionKey, conn.txSeq.next());
+          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", enc, iv, seq, sessionId });
         } else {
           sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", data: chunk, sessionId });
         }
       }
     },
     (sessionId) => {
+      const tail = flushStreamingRedaction(sessionId);
+      if (tail && conn.isReady()) {
+        if (conn.sessionKey) {
+          const { enc, iv, seq } = encryptPayload(tail, conn.sessionKey, conn.txSeq.next());
+          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", enc, iv, seq, sessionId });
+        } else {
+          sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", data: tail, sessionId });
+        }
+      }
       if (!conn.isReady()) return;
       sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "stream-stopped", sessionId });
     }
@@ -4965,10 +5344,11 @@ async function runAgent(rawOptions) {
       outputBuffer.push(chunk);
       return;
     }
-    for (const outputChunk of splitTransportChunks(chunk)) {
+    const redacted = redactStreamingChunk(ptySessionId, chunk);
+    for (const outputChunk of splitTransportChunks(redacted)) {
       if (conn.sessionKey) {
-        const { enc, iv } = encryptPayload(outputChunk, conn.sessionKey);
-        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", enc, iv, sessionId: ptySessionId });
+        const { enc, iv, seq } = encryptPayload(outputChunk, conn.sessionKey, conn.txSeq.next());
+        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", enc, iv, seq, sessionId: ptySessionId });
       } else {
         sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "output", data: outputChunk, sessionId: ptySessionId });
       }
@@ -4990,8 +5370,8 @@ async function runAgent(rawOptions) {
       };
       if (conn.sessionKey) {
         const contentStr = JSON.stringify(payload);
-        const { enc, iv } = encryptPayload(contentStr, conn.sessionKey);
-        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, sessionId });
+        const { enc, iv, seq: frameSeq } = encryptPayload(contentStr, conn.sessionKey, conn.txSeq.next());
+        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, seq: frameSeq, sessionId });
       } else {
         sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, payload);
       }
@@ -5007,8 +5387,8 @@ async function runAgent(rawOptions) {
       };
       if (conn.sessionKey) {
         const contentStr = JSON.stringify(payload);
-        const { enc, iv } = encryptPayload(contentStr, conn.sessionKey);
-        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, sessionId });
+        const { enc, iv, seq: frameSeq } = encryptPayload(contentStr, conn.sessionKey, conn.txSeq.next());
+        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, seq: frameSeq, sessionId });
       } else {
         sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, payload);
       }
@@ -5026,8 +5406,8 @@ async function runAgent(rawOptions) {
       };
       if (conn.sessionKey) {
         const contentStr = JSON.stringify(payload);
-        const { enc, iv } = encryptPayload(contentStr, conn.sessionKey);
-        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, sessionId });
+        const { enc, iv, seq: frameSeq } = encryptPayload(contentStr, conn.sessionKey, conn.txSeq.next());
+        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, seq: frameSeq, sessionId });
       } else {
         sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, payload);
       }
@@ -5045,8 +5425,8 @@ async function runAgent(rawOptions) {
       };
       if (conn.sessionKey) {
         const contentStr = JSON.stringify(payload);
-        const { enc, iv } = encryptPayload(contentStr, conn.sessionKey);
-        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, sessionId });
+        const { enc, iv, seq: frameSeq } = encryptPayload(contentStr, conn.sessionKey, conn.txSeq.next());
+        sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, { type: "markdown", enc, iv, seq: frameSeq, sessionId });
       } else {
         sendToGroup(conn.activeSocket, conn.activeGroups.privateGroup, payload);
       }
@@ -5105,7 +5485,7 @@ async function runAgent(rawOptions) {
             dispatcher.setApprovalEnforcer(null);
           }
           ws.on("open", async () => {
-            console.log("[rAgent] Connector connected to relay.");
+            log15.info("connector connected to relay");
             conn.resetReconnectDelay();
             ws.send(JSON.stringify({ type: "joinGroup", group: groups.privateGroup }));
             ws.send(JSON.stringify({ type: "joinGroup", group: groups.registryGroup }));
@@ -5116,11 +5496,22 @@ async function runAgent(rawOptions) {
             });
             conn.replayBufferedOutput((chunk) => {
               for (const outputChunk of splitTransportChunks(chunk)) {
-                sendToGroup(ws, groups.privateGroup, {
-                  type: "output",
-                  data: outputChunk,
-                  sessionId: ptySessionId
-                });
+                if (conn.sessionKey) {
+                  const { enc, iv, seq } = encryptPayload(outputChunk, conn.sessionKey, conn.txSeq.next());
+                  sendToGroup(ws, groups.privateGroup, {
+                    type: "output",
+                    enc,
+                    iv,
+                    seq,
+                    sessionId: ptySessionId
+                  });
+                } else {
+                  sendToGroup(ws, groups.privateGroup, {
+                    type: "output",
+                    data: outputChunk,
+                    sessionId: ptySessionId
+                  });
+                }
               }
             });
             for (const [sessionId] of sessionStreamer.activeStreams()) {
@@ -5128,8 +5519,8 @@ async function runAgent(rawOptions) {
               for (const chunk of buffered) {
                 for (const outputChunk of splitTransportChunks(chunk)) {
                   if (conn.sessionKey) {
-                    const { enc, iv } = encryptPayload(outputChunk, conn.sessionKey);
-                    sendToGroup(ws, groups.privateGroup, { type: "output", enc, iv, sessionId });
+                    const { enc, iv, seq } = encryptPayload(outputChunk, conn.sessionKey, conn.txSeq.next());
+                    sendToGroup(ws, groups.privateGroup, { type: "output", enc, iv, seq, sessionId });
                   } else {
                     sendToGroup(ws, groups.privateGroup, { type: "output", data: outputChunk, sessionId });
                   }
@@ -5155,9 +5546,26 @@ async function runAgent(rawOptions) {
               if (payload.type === "input") {
                 let inputData = null;
                 if (typeof payload.enc === "string" && typeof payload.iv === "string" && conn.sessionKey) {
-                  inputData = decryptPayload(payload.enc, payload.iv, conn.sessionKey);
-                  if (inputData === null) {
-                    console.warn("[rAgent] Failed to decrypt input \u2014 ignoring.");
+                  const inSeq = typeof payload.seq === "number" ? payload.seq : null;
+                  const rxSeq = conn.getRxSeqForViewer(payload.viewerId);
+                  if (inSeq === null) {
+                    log15.warn("rejecting encrypted input frame without seq (#310)");
+                  } else if (!rxSeq.accept(inSeq)) {
+                    log15.warn("rejecting replayed/out-of-order input", {
+                      seq: inSeq,
+                      lastSeen: rxSeq.lastSeq,
+                      viewerId: typeof payload.viewerId === "string" ? payload.viewerId : "_legacy"
+                    });
+                  } else {
+                    inputData = decryptPayload(
+                      payload.enc,
+                      payload.iv,
+                      conn.sessionKey,
+                      inSeq
+                    );
+                    if (inputData === null) {
+                      log15.warn("failed to decrypt input \u2014 ignoring");
+                    }
                   }
                 } else if (typeof payload.data === "string") {
                   inputData = payload.data;
@@ -5187,11 +5595,13 @@ async function runAgent(rawOptions) {
             }
           });
           ws.on("error", (error) => {
-            console.error("[rAgent] WebSocket error:", error.message);
+            log15.error("websocket error", { error: error.message });
           });
           ws.on("close", (code, reason) => {
-            const details = code || reason.length > 0 ? ` (code=${code}${reason.length > 0 ? ` reason=${reason.toString()}` : ""})` : "";
-            console.log(`[rAgent] Relay disconnected${details}. Output will be buffered until reconnect.`);
+            const fields = {};
+            if (code) fields.code = code;
+            if (reason.length > 0) fields.reason = reason.toString();
+            log15.info("relay disconnected; output will be buffered until reconnect", fields);
             conn.cleanup();
             resolve();
           });
@@ -5208,35 +5618,35 @@ async function runAgent(rawOptions) {
               });
               inventory.updateOptions(options);
               dispatcher.updateOptions(options);
-              console.log("[rAgent] Recovered from auth failure via machine credential. Reconnecting...");
+              log15.info("recovered from auth failure via machine credential; reconnecting");
               continue;
             } catch (mcError) {
               if (mcError instanceof AuthError) {
-                console.error(`[rAgent] ${mcError.message}`);
+                log15.error("auth recovery failed", { error: mcError.message });
               } else {
                 const mcMsg = mcError instanceof Error ? mcError.message : String(mcError);
-                console.error(`[rAgent] Machine credential recovery failed: ${mcMsg}`);
+                log15.error("machine credential recovery failed", { error: mcMsg });
               }
             }
           }
-          console.error(`[rAgent] ${error.message}`);
-          console.error(
-            "[rAgent] Connector token is invalid or revoked. Stopping. Re-connect with: ragent connect --token <token>"
+          log15.error("auth error", { error: error.message });
+          log15.error(
+            "connector token is invalid or revoked. Stopping. Re-connect with: ragent connect --token <token>"
           );
           dispatcher.shouldRun = false;
           break;
         }
         const message = error instanceof Error ? error.message : String(error);
-        console.error(`[rAgent] Relay connect failed: ${message}`);
+        log15.error("relay connect failed", { error: message });
       }
       if (!dispatcher.shouldRun) break;
       if (dispatcher.reconnectRequested) {
-        console.log("[rAgent] Reconnecting to relay...");
+        log15.info("reconnecting to relay");
         await wait(300);
         continue;
       }
       const jitteredDelay = conn.reconnectDelay * (0.5 + Math.random());
-      console.log(`[rAgent] Disconnected. Reconnecting in ${Math.round(jitteredDelay / 1e3)}s...`);
+      log15.info("disconnected; reconnecting", { seconds: Math.round(jitteredDelay / 1e3) });
       await wait(jitteredDelay);
       conn.reconnectDelay = Math.min(conn.reconnectDelay * 1.5, MAX_RECONNECT_DELAY_MS);
     }
@@ -5335,6 +5745,7 @@ function printCommandArt(title, subtitle = "remote agent control") {
 }
 
 // src/commands/connect.ts
+var log16 = createLogger("connect");
 async function connectMachine(opts) {
   const portal = opts.portal || DEFAULT_PORTAL;
   const hostId = sanitizeHostId(opts.id || inferHostId());
@@ -5366,12 +5777,12 @@ async function connectMachine(opts) {
     nextConfig.refreshExpiresAt = claimed.refreshExpiresAt;
   }
   saveConfig(nextConfig);
-  console.log(`[rAgent] Machine connected: ${hostName} (${hostId})`);
-  console.log(`[rAgent] Machine name: ${hostName} (override with --name <friendly-name>)`);
-  console.log(`[rAgent] Config saved to ${CONFIG_FILE}`);
+  log16.info("machine connected", { hostName, hostId });
+  log16.info("machine name (override with --name <friendly-name>)", { hostName });
+  log16.info("config saved", { path: CONFIG_FILE });
   if (opts.asService) {
     await ensureServiceInstalled({ enable: true, start: true });
-    console.log("[rAgent] Service mode enabled.");
+    log16.info("service mode enabled");
     return;
   }
   if (opts.run !== false) {
@@ -5391,13 +5802,14 @@ function registerConnectCommand(program2) {
       await connectMachine(opts);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Connect failed: ${message}`);
+      log16.error("connect failed", { error: message });
       process.exit(1);
     }
   });
 }
 
 // src/commands/run.ts
+var log17 = createLogger("run");
 function registerRunCommand(program2) {
   program2.command("run").description("Run connector for a connected machine").option("--portal <url>", "Portal base URL").option("--agent-token <token>", "Connector token").option("-i, --id <id>", "Machine ID").option("-n, --name <name>", "Machine name").option("-c, --command <command>", "CLI command to run").option("--no-redact", "Disable secret redaction in terminal output").action(async (opts) => {
     try {
@@ -5405,7 +5817,7 @@ function registerRunCommand(program2) {
       await runAgent(opts);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Run failed: ${message}`);
+      log17.error("run failed", { error: message });
       process.exit(1);
     }
   });
@@ -5413,6 +5825,7 @@ function registerRunCommand(program2) {
 
 // src/commands/doctor.ts
 var os10 = __toESM(require("os"));
+var log18 = createLogger("doctor");
 async function runDoctor(opts) {
   const options = resolveRunOptions(opts);
   const checks = [];
@@ -5448,29 +5861,27 @@ async function runDoctor(opts) {
     console.log(`${check.ok ? "PASS" : "FAIL"}  ${check.name}: ${check.detail}`);
   });
   if (!platformOk) {
-    console.log("[rAgent] Linux is required for the connector.");
+    log18.info("Linux is required for the connector");
   }
   if (!tmuxOk) {
     const recipe = await chooseTmuxInstallCommand();
     if (recipe) {
-      console.log(`[rAgent] tmux install suggestion: ${recipe.command}`);
+      log18.info("tmux install suggestion", { command: recipe.command });
     }
     if (opts.fix) {
       try {
         const installed = await installTmuxInteractively();
         if (installed) {
-          console.log("[rAgent] tmux installation complete.");
+          log18.info("tmux installation complete");
         } else {
-          console.log("[rAgent] tmux installation skipped or incomplete.");
+          log18.info("tmux installation skipped or incomplete");
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        console.error(`[rAgent] Failed to install tmux: ${message}`);
+        log18.error("failed to install tmux", { error: message });
       }
     } else {
-      console.log(
-        "[rAgent] Run `ragent doctor --fix` to install missing dependencies interactively."
-      );
+      log18.info("run `ragent doctor --fix` to install missing dependencies interactively");
     }
   }
 }
@@ -5482,32 +5893,33 @@ function registerDoctorCommand(program2) {
 }
 
 // src/commands/update.ts
+var log19 = createLogger("update");
 function registerUpdateCommand(program2) {
   program2.command("update").description("Update ragent CLI from npm").option("--check", "Check for updates only; do not install").option("--no-restart", "Do not restart the service after updating").action(async (opts) => {
     printCommandArt("Update", "checking npm registry for newer ragent-cli versions");
     const latestVersion = await checkForUpdate({ force: true });
     if (!latestVersion) {
-      console.log(`[rAgent] You are up to date (${CURRENT_VERSION}).`);
+      log19.info("you are up to date", { version: CURRENT_VERSION });
       return;
     }
-    console.log(`[rAgent] Update available: ${CURRENT_VERSION} -> ${latestVersion}`);
+    log19.info("update available", { current: CURRENT_VERSION, latest: latestVersion });
     if (opts.check) return;
     await execAsync(`npm install -g ${shellQuote(PACKAGE_NAME)}`, {
       timeout: 5 * 60 * 1e3,
       maxBuffer: 10 * 1024 * 1024
     });
-    console.log(`[rAgent] Updated to ${latestVersion}.`);
+    log19.info("updated", { version: latestVersion });
     const backend = getConfiguredServiceBackend();
     if (backend && opts.restart) {
-      console.log(`[rAgent] Restarting ${backend} service...`);
+      log19.info("restarting service", { backend });
       try {
         await restartService();
       } catch (err) {
-        console.error(`[rAgent] Failed to restart service: ${err instanceof Error ? err.message : err}`);
-        console.log("[rAgent] Please restart manually: ragent service restart");
+        log19.error("failed to restart service", { error: err instanceof Error ? err.message : String(err) });
+        log19.info("please restart manually: ragent service restart");
       }
     } else if (!backend) {
-      console.log("[rAgent] No service backend detected. If ragent is running manually, restart it to use the new version.");
+      log19.info("no service backend detected. If ragent is running manually, restart it to use the new version");
     }
   });
 }
@@ -5531,6 +5943,7 @@ function registerSessionsCommand(program2) {
 }
 
 // src/commands/service.ts
+var log20 = createLogger("service-cmd");
 function registerServiceCommand(program2) {
   const service = program2.command("service").description("Manage background connector service");
   service.command("install").description("Install service (systemd user unit when available)").option("--start", "Start service immediately").option("--no-enable", "Do not enable autostart in systemd").action(async (opts) => {
@@ -5541,7 +5954,7 @@ function registerServiceCommand(program2) {
       });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Service install failed: ${message}`);
+      log20.error("service install failed", { error: message });
       process.exit(1);
     }
   });
@@ -5550,7 +5963,7 @@ function registerServiceCommand(program2) {
       await startService();
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Service start failed: ${message}`);
+      log20.error("service start failed", { error: message });
       process.exit(1);
     }
   });
@@ -5559,7 +5972,7 @@ function registerServiceCommand(program2) {
       await stopService();
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Service stop failed: ${message}`);
+      log20.error("service stop failed", { error: message });
       process.exit(1);
     }
   });
@@ -5568,7 +5981,7 @@ function registerServiceCommand(program2) {
       await restartService();
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Service restart failed: ${message}`);
+      log20.error("service restart failed", { error: message });
       process.exit(1);
     }
   });
@@ -5577,7 +5990,7 @@ function registerServiceCommand(program2) {
       await printServiceStatus();
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Service status failed: ${message}`);
+      log20.error("service status failed", { error: message });
       process.exit(1);
     }
   });
@@ -5586,7 +5999,7 @@ function registerServiceCommand(program2) {
       await printServiceLogs(opts);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Service logs failed: ${message}`);
+      log20.error("service logs failed", { error: message });
       process.exit(1);
     }
   });
@@ -5595,7 +6008,7 @@ function registerServiceCommand(program2) {
       await uninstallService();
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Service uninstall failed: ${message}`);
+      log20.error("service uninstall failed", { error: message });
       process.exit(1);
     }
   });
@@ -5603,6 +6016,7 @@ function registerServiceCommand(program2) {
 
 // src/commands/uninstall.ts
 var fs6 = __toESM(require("fs"));
+var log21 = createLogger("uninstall");
 async function uninstallAgent(opts) {
   const config = loadConfig();
   const hostName = config.hostName || config.hostId || "this machine";
@@ -5612,12 +6026,12 @@ async function uninstallAgent(opts) {
       false
     );
     if (!confirmed) {
-      console.log("[rAgent] Uninstall cancelled.");
+      log21.info("uninstall cancelled");
       return;
     }
   }
   if (config.portal && config.agentToken) {
-    console.log("[rAgent] Deregistering from server...");
+    log21.info("deregistering from server");
     try {
       const token = await refreshTokenIfNeeded({
         portal: config.portal,
@@ -5625,24 +6039,24 @@ async function uninstallAgent(opts) {
       });
       const ok = await deregisterHost({ portal: config.portal, agentToken: token });
       if (ok) {
-        console.log("[rAgent] Host removed from server.");
+        log21.info("host removed from server");
       }
     } catch {
-      console.warn("[rAgent] Could not reach server \u2014 host may need manual removal from dashboard.");
+      log21.warn("could not reach server \u2014 host may need manual removal from dashboard");
     }
   }
-  console.log("[rAgent] Stopping and removing service...");
+  log21.info("stopping and removing service");
   await uninstallService().catch(() => void 0);
   if (fs6.existsSync(CONFIG_DIR)) {
     fs6.rmSync(CONFIG_DIR, { recursive: true, force: true });
-    console.log(`[rAgent] Removed config directory: ${CONFIG_DIR}`);
+    log21.info("removed config directory", { path: CONFIG_DIR });
   }
   try {
     await execAsync(`npm unlink -g ${PACKAGE_NAME}`, { timeout: 15e3 });
-    console.log(`[rAgent] Unlinked global package: ${PACKAGE_NAME}`);
+    log21.info("unlinked global package", { package: PACKAGE_NAME });
   } catch {
   }
-  console.log("[rAgent] Uninstall complete. rAgent has been removed from this machine.");
+  log21.info("uninstall complete. rAgent has been removed from this machine");
 }
 function registerUninstallCommand(parent) {
   parent.command("uninstall").description("Remove rAgent from this machine (stops service, deletes config, unlinks CLI)").option("-y, --yes", "Skip confirmation prompt").action(async (opts) => {
@@ -5651,7 +6065,7 @@ function registerUninstallCommand(parent) {
       await uninstallAgent(opts);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`[rAgent] Uninstall failed: ${message}`);
+      log21.error("uninstall failed", { error: message });
       process.exit(1);
     }
   });
@@ -5710,9 +6124,10 @@ function registerDiscoverCommand(program2) {
 }
 
 // src/index.ts
+var log22 = createLogger("cli");
 process.on("unhandledRejection", (reason) => {
   const message = reason instanceof Error ? reason.stack || reason.message : String(reason);
-  console.error(`[rAgent] Unhandled promise rejection: ${message}`);
+  log22.error("unhandled promise rejection", { error: message });
 });
 import_commander.program.name("ragent").description("Connect machines to rAgent Live").version(CURRENT_VERSION);
 registerConnectCommand(import_commander.program);