flaio-cli 1.0.12 → 1.0.14

package/dist/config/config.d.ts

@@ -7,19 +7,19 @@ declare const SlackConfigSchema: z.ZodObject<{
     pollInterval: z.ZodDefault<z.ZodNumber>;
     timeout: z.ZodDefault<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
-    timeout: number;
     enabled: boolean;
     pollInterval: number;
+    timeout: number;
     botToken?: string | undefined;
     appToken?: string | undefined;
     channelId?: string | undefined;
 }, {
-    timeout?: number | undefined;
     enabled?: boolean | undefined;
     botToken?: string | undefined;
     appToken?: string | undefined;
     channelId?: string | undefined;
     pollInterval?: number | undefined;
+    timeout?: number | undefined;
 }>;
 declare const DiscordConfigSchema: z.ZodObject<{
     enabled: z.ZodDefault<z.ZodBoolean>;
@@ -27,15 +27,15 @@ declare const DiscordConfigSchema: z.ZodObject<{
     channelId: z.ZodOptional<z.ZodString>;
     timeout: z.ZodDefault<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
-    timeout: number;
     enabled: boolean;
+    timeout: number;
     botToken?: string | undefined;
     channelId?: string | undefined;
 }, {
-    timeout?: number | undefined;
     enabled?: boolean | undefined;
     botToken?: string | undefined;
     channelId?: string | undefined;
+    timeout?: number | undefined;
 }>;
 declare const TelegramConfigSchema: z.ZodObject<{
     enabled: z.ZodDefault<z.ZodBoolean>;
@@ -43,14 +43,14 @@ declare const TelegramConfigSchema: z.ZodObject<{
     chatId: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
     timeout: z.ZodDefault<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
-    timeout: number;
     enabled: boolean;
+    timeout: number;
     botToken?: string | undefined;
     chatId?: string | number | undefined;
 }, {
-    timeout?: number | undefined;
     enabled?: boolean | undefined;
     botToken?: string | undefined;
+    timeout?: number | undefined;
     chatId?: string | number | undefined;
 }>;
 declare const RelayConfigSchema: z.ZodObject<{
@@ -66,7 +66,7 @@ declare const RelayConfigSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     enabled: boolean;
     autoConnect: boolean;
-    defaultShareMode: "read-only" | "read-write";
+    defaultShareMode: "read-write" | "read-only";
     maxReplayBufferKB: number;
     e2eEncryption: boolean;
     relayUrl: string;
@@ -78,7 +78,7 @@ declare const RelayConfigSchema: z.ZodObject<{
     authToken?: string | undefined;
     refreshToken?: string | undefined;
     autoConnect?: boolean | undefined;
-    defaultShareMode?: "read-only" | "read-write" | undefined;
+    defaultShareMode?: "read-write" | "read-only" | undefined;
     maxReplayBufferKB?: number | undefined;
     e2eEncryption?: boolean | undefined;
     relayUrl?: string | undefined;
@@ -123,19 +123,19 @@ declare const AppConfigSchema: z.ZodObject<{
             pollInterval: z.ZodDefault<z.ZodNumber>;
             timeout: z.ZodDefault<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            timeout: number;
             enabled: boolean;
             pollInterval: number;
+            timeout: number;
             botToken?: string | undefined;
             appToken?: string | undefined;
             channelId?: string | undefined;
         }, {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
             appToken?: string | undefined;
             channelId?: string | undefined;
             pollInterval?: number | undefined;
+            timeout?: number | undefined;
         }>>;
         discord: z.ZodDefault<z.ZodObject<{
             enabled: z.ZodDefault<z.ZodBoolean>;
@@ -143,15 +143,15 @@ declare const AppConfigSchema: z.ZodObject<{
             channelId: z.ZodOptional<z.ZodString>;
             timeout: z.ZodDefault<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            timeout: number;
             enabled: boolean;
+            timeout: number;
             botToken?: string | undefined;
             channelId?: string | undefined;
         }, {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
             channelId?: string | undefined;
+            timeout?: number | undefined;
         }>>;
         telegram: z.ZodDefault<z.ZodObject<{
             enabled: z.ZodDefault<z.ZodBoolean>;
@@ -159,56 +159,56 @@ declare const AppConfigSchema: z.ZodObject<{
             chatId: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
             timeout: z.ZodDefault<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
-            timeout: number;
             enabled: boolean;
+            timeout: number;
             botToken?: string | undefined;
             chatId?: string | number | undefined;
         }, {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
+            timeout?: number | undefined;
             chatId?: string | number | undefined;
         }>>;
     }, "strip", z.ZodTypeAny, {
         slack: {
-            timeout: number;
             enabled: boolean;
             pollInterval: number;
+            timeout: number;
             botToken?: string | undefined;
             appToken?: string | undefined;
             channelId?: string | undefined;
         };
         discord: {
-            timeout: number;
             enabled: boolean;
+            timeout: number;
             botToken?: string | undefined;
             channelId?: string | undefined;
         };
         telegram: {
-            timeout: number;
             enabled: boolean;
+            timeout: number;
             botToken?: string | undefined;
             chatId?: string | number | undefined;
         };
     }, {
         slack?: {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
             appToken?: string | undefined;
             channelId?: string | undefined;
             pollInterval?: number | undefined;
+            timeout?: number | undefined;
         } | undefined;
         discord?: {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
             channelId?: string | undefined;
+            timeout?: number | undefined;
         } | undefined;
         telegram?: {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
+            timeout?: number | undefined;
             chatId?: string | number | undefined;
         } | undefined;
     }>>;
@@ -235,7 +235,7 @@ declare const AppConfigSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         enabled: boolean;
         autoConnect: boolean;
-        defaultShareMode: "read-only" | "read-write";
+        defaultShareMode: "read-write" | "read-only";
         maxReplayBufferKB: number;
         e2eEncryption: boolean;
         relayUrl: string;
@@ -247,7 +247,7 @@ declare const AppConfigSchema: z.ZodObject<{
         authToken?: string | undefined;
         refreshToken?: string | undefined;
         autoConnect?: boolean | undefined;
-        defaultShareMode?: "read-only" | "read-write" | undefined;
+        defaultShareMode?: "read-write" | "read-only" | undefined;
         maxReplayBufferKB?: number | undefined;
         e2eEncryption?: boolean | undefined;
         relayUrl?: string | undefined;
@@ -281,11 +281,6 @@ declare const AppConfigSchema: z.ZodObject<{
         statusCheckInterval: number;
         detectorInterval: number;
     };
-    worktree: {
-        planning: boolean;
-        interactivePlanning: boolean;
-        implementation: boolean;
-    };
     ui: {
         sidebarWidth: number;
         narrowBreakpoint: number;
@@ -294,22 +289,22 @@ declare const AppConfigSchema: z.ZodObject<{
     };
     connectors: {
         slack: {
-            timeout: number;
             enabled: boolean;
             pollInterval: number;
+            timeout: number;
             botToken?: string | undefined;
             appToken?: string | undefined;
             channelId?: string | undefined;
         };
         discord: {
-            timeout: number;
             enabled: boolean;
+            timeout: number;
             botToken?: string | undefined;
             channelId?: string | undefined;
         };
         telegram: {
-            timeout: number;
             enabled: boolean;
+            timeout: number;
             botToken?: string | undefined;
             chatId?: string | number | undefined;
         };
@@ -317,7 +312,7 @@ declare const AppConfigSchema: z.ZodObject<{
     relay: {
         enabled: boolean;
         autoConnect: boolean;
-        defaultShareMode: "read-only" | "read-write";
+        defaultShareMode: "read-write" | "read-only";
         maxReplayBufferKB: number;
         e2eEncryption: boolean;
         relayUrl: string;
@@ -325,6 +320,11 @@ declare const AppConfigSchema: z.ZodObject<{
         authToken?: string | undefined;
         refreshToken?: string | undefined;
     };
+    worktree: {
+        planning: boolean;
+        interactivePlanning: boolean;
+        implementation: boolean;
+    };
     telemetry: {
         enabled: boolean;
         crashReports: boolean;
@@ -334,11 +334,6 @@ declare const AppConfigSchema: z.ZodObject<{
         statusCheckInterval?: number | undefined;
         detectorInterval?: number | undefined;
     } | undefined;
-    worktree?: {
-        planning?: boolean | undefined;
-        interactivePlanning?: boolean | undefined;
-        implementation?: boolean | undefined;
-    } | undefined;
     ui?: {
         sidebarWidth?: number | undefined;
         narrowBreakpoint?: number | undefined;
@@ -347,23 +342,23 @@ declare const AppConfigSchema: z.ZodObject<{
     } | undefined;
     connectors?: {
         slack?: {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
             appToken?: string | undefined;
             channelId?: string | undefined;
             pollInterval?: number | undefined;
+            timeout?: number | undefined;
         } | undefined;
         discord?: {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
             channelId?: string | undefined;
+            timeout?: number | undefined;
         } | undefined;
         telegram?: {
-            timeout?: number | undefined;
             enabled?: boolean | undefined;
             botToken?: string | undefined;
+            timeout?: number | undefined;
             chatId?: string | number | undefined;
         } | undefined;
     } | undefined;
@@ -372,12 +367,17 @@ declare const AppConfigSchema: z.ZodObject<{
         authToken?: string | undefined;
         refreshToken?: string | undefined;
         autoConnect?: boolean | undefined;
-        defaultShareMode?: "read-only" | "read-write" | undefined;
+        defaultShareMode?: "read-write" | "read-only" | undefined;
         maxReplayBufferKB?: number | undefined;
         e2eEncryption?: boolean | undefined;
         relayUrl?: string | undefined;
         authUrl?: string | undefined;
     } | undefined;
+    worktree?: {
+        planning?: boolean | undefined;
+        interactivePlanning?: boolean | undefined;
+        implementation?: boolean | undefined;
+    } | undefined;
     telemetry?: {
         enabled?: boolean | undefined;
         crashReports?: boolean | undefined;

package/dist/relay/relay-client.d.ts

@@ -10,9 +10,12 @@ export declare class RelayClient extends EventEmitter {
     private pingTimer;
     private pongTimer;
     private started;
+    private lastPingTime;
+    private connectSpan;
     private inputLimiter;
     private browseLimiter;
     private createSessionLimiter;
+    private cachedDriversResult;
     constructor();
     private get e2eEnabled();
     start(): Promise<void>;

package/dist/relay/relay-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relay-client.d.ts","sourceRoot":"","sources":["../../src/relay/relay-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgI3C,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,CAAuC;IACjD,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,UAAU,CAA6B;IAG/C,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,eAAe,CAAS;IAGhC,OAAO,CAAC,SAAS,CAA+C;IAChE,OAAO,CAAC,SAAS,CAA8C;IAE/D,OAAO,CAAC,OAAO,CAAS;IAGxB,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,oBAAoB,CAA2B;;IAQvD,OAAO,KAAK,UAAU,GAErB;IAMK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAUtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YA4Cb,OAAO;IAmFrB,OAAO,CAAC,aAAa;YAsGP,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,kBAAkB;YAUZ,iBAAiB;YAajB,eAAe;YA6Cf,iBAAiB;YAoDjB,oBAAoB;YA6EpB,mBAAmB;YAwJnB,8BAA8B;YA4E9B,yBAAyB;IA6HvC,OAAO,CAAC,oBAAoB;YAsBd,qBAAqB;YA+CrB,oBAAoB;IAoClC,OAAO,CAAC,mBAAmB;YAWb,WAAW;YAiCX,mBAAmB;YAyBnB,aAAa;YA+Cb,YAAY;IA2G1B,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,eAAe;IA4CvB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,mBAAmB;IAWpB,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,mBAAmB,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC,GAAG,IAAI;IAOtI,OAAO,CAAC,IAAI;CAiBb"}
+{"version":3,"file":"relay-client.d.ts","sourceRoot":"","sources":["../../src/relay/relay-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA2K3C,qBAAa,WAAY,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,CAAuC;IACjD,OAAO,CAAC,eAAe,CAAqC;IAC5D,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,UAAU,CAA6B;IAG/C,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,eAAe,CAAS;IAGhC,OAAO,CAAC,SAAS,CAA+C;IAChE,OAAO,CAAC,SAAS,CAA8C;IAE/D,OAAO,CAAC,OAAO,CAAS;IAGxB,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,WAAW,CAAqB;IAGxC,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,oBAAoB,CAA2B;IAGvD,OAAO,CAAC,mBAAmB,CAAgG;;IAQ3H,OAAO,KAAK,UAAU,GAErB;IAMK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAUtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YA6Cb,OAAO;IA8FrB,OAAO,CAAC,aAAa;YA4GP,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,UAAU;IAUlB,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,kBAAkB;YAYZ,iBAAiB;YAejB,eAAe;YA6Cf,iBAAiB;YAoDjB,oBAAoB;YA6EpB,mBAAmB;YAoKnB,8BAA8B;YA4E9B,yBAAyB;IA0JvC,OAAO,CAAC,oBAAoB;YAsBd,qBAAqB;YA+CrB,oBAAoB;IAoClC,OAAO,CAAC,mBAAmB;YAWb,WAAW;YAwDX,mBAAmB;YAyBnB,aAAa;YA+Cb,YAAY;IA2G1B,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,eAAe;IA4CvB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,mBAAmB;IAWpB,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,mBAAmB,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC,GAAG,IAAI;IAOtI,OAAO,CAAC,IAAI;CAiBb"}

package/dist/relay/relay-client.js

@@ -1,3 +1,4 @@
+import { stripAnsi } from "../strip-ansi.js";
 import { EventEmitter } from "node:events";
 import fs from "node:fs/promises";
 import os from "node:os";
@@ -15,43 +16,82 @@ import { makeDebugLog } from "../connectors/debug.js";
 import { RelayToCliMsgSchema } from "./relay-message-schemas.js";
 import { RateLimiter } from "./rate-limiter.js";
 import { sessionMetadataStore } from "../agents/session-metadata.js";
+import { trackCliEvent, startTransaction } from "../analytics/index.js";
+import * as Sentry from "@sentry/node";
 const debugLog = makeDebugLog("relay");
 // ---------------------------------------------------------------------------
 // Replay buffer — ring buffer of recent PTY output per session
 // ---------------------------------------------------------------------------
+class SessionRingBuffer {
+    chunks;
+    head = 0;
+    tail = 0;
+    count = 0;
+    size = 0;
+    capacity;
+    maxBytes;
+    constructor(maxBytes, initialCapacity = 256) {
+        this.maxBytes = maxBytes;
+        this.capacity = initialCapacity;
+        this.chunks = new Array(initialCapacity).fill(null);
+    }
+    push(data) {
+        while (this.size + data.length > this.maxBytes && this.count > 0) {
+            const removed = this.chunks[this.head];
+            this.chunks[this.head] = null;
+            this.head = (this.head + 1) % this.capacity;
+            this.count--;
+            this.size -= removed.length;
+        }
+        if (this.count === this.capacity) {
+            this.grow();
+        }
+        this.chunks[this.tail] = data;
+        this.tail = (this.tail + 1) % this.capacity;
+        this.count++;
+        this.size += data.length;
+    }
+    toArray() {
+        const result = [];
+        for (let i = 0; i < this.count; i++) {
+            result.push(this.chunks[(this.head + i) % this.capacity]);
+        }
+        return result;
+    }
+    grow() {
+        const newCapacity = this.capacity * 2;
+        const newChunks = new Array(newCapacity).fill(null);
+        for (let i = 0; i < this.count; i++) {
+            newChunks[i] = this.chunks[(this.head + i) % this.capacity];
+        }
+        this.chunks = newChunks;
+        this.head = 0;
+        this.tail = this.count;
+        this.capacity = newCapacity;
+    }
+}
 class ReplayBuffer {
     buffers = new Map();
-    sizes = new Map();
     maxBytes;
     constructor(maxKB) {
         this.maxBytes = maxKB * 1024;
     }
     push(sessionId, data) {
-        let chunks = this.buffers.get(sessionId);
-        let size = this.sizes.get(sessionId) ?? 0;
-        if (!chunks) {
-            chunks = [];
-            this.buffers.set(sessionId, chunks);
-        }
-        chunks.push(data);
-        size += data.length;
-        // Evict oldest chunks when over budget
-        while (size > this.maxBytes && chunks.length > 1) {
-            const removed = chunks.shift();
-            size -= removed.length;
-        }
-        this.sizes.set(sessionId, size);
+        let ring = this.buffers.get(sessionId);
+        if (!ring) {
+            ring = new SessionRingBuffer(this.maxBytes);
+            this.buffers.set(sessionId, ring);
+        }
+        ring.push(data);
     }
     get(sessionId) {
-        return this.buffers.get(sessionId) ?? [];
+        return this.buffers.get(sessionId)?.toArray() ?? [];
     }
     remove(sessionId) {
         this.buffers.delete(sessionId);
-        this.sizes.delete(sessionId);
     }
     clear() {
         this.buffers.clear();
-        this.sizes.clear();
     }
 }
 // ---------------------------------------------------------------------------
@@ -70,10 +110,15 @@ export class RelayClient extends EventEmitter {
     pingTimer = null;
     pongTimer = null;
     started = false;
+    // Analytics
+    lastPingTime = 0;
+    connectSpan = null;
     // Rate limiters
     inputLimiter = new RateLimiter(30, 30); // 30 inputs/sec per key
     browseLimiter = new RateLimiter(10, 10); // 10 browse requests/sec
     createSessionLimiter = new RateLimiter(1, 0.2); // 1 per 5 seconds
+    // Cached driver list (avoids re-checking installed status on every poll)
+    cachedDriversResult = null;
     constructor() {
         super();
         const maxKB = settingsStore.getState().config.relay.maxReplayBufferKB;
@@ -116,6 +161,7 @@ export class RelayClient extends EventEmitter {
         }
         this.trackedSessions.clear();
         this.replayBuffer.clear();
+        this.cachedDriversResult = null;
         clearViewerCounts();
         this.inputLimiter.clear();
         this.browseLimiter.clear();
@@ -137,6 +183,7 @@ export class RelayClient extends EventEmitter {
             return;
         }
         setRelayConnectionStatus("connecting");
+        this.connectSpan = startTransaction("relay.connect", "websocket.connect");
         try {
             // Clean up previous WebSocket if it exists (e.g. on reconnect)
             if (this.ws) {
@@ -152,9 +199,14 @@ export class RelayClient extends EventEmitter {
             this.ws = new WebSocket(relayUrl);
             this.ws.on("open", () => {
                 debugLog("relay: connected to relay server");
+                this.connectSpan?.end();
+                this.connectSpan = null;
                 setRelayConnectionStatus("authenticating");
                 this.send({ type: "cli_auth", token: token });
                 this.startHeartbeat();
+                trackCliEvent("cli_relay_connected", {
+                    attempt: this.reconnectAttempt,
+                });
             });
             this.ws.on("message", (raw) => {
                 try {
@@ -186,6 +238,11 @@ export class RelayClient extends EventEmitter {
             });
             this.ws.on("error", (err) => {
                 debugLog(`relay: WebSocket error: ${err.message}`);
+                if (this.connectSpan) {
+                    this.connectSpan.setStatus({ code: 2, message: err.message });
+                    this.connectSpan.end();
+                    this.connectSpan = null;
+                }
                 setRelayConnectionStatus("error", err.message);
             });
         }
@@ -243,6 +300,12 @@ export class RelayClient extends EventEmitter {
                 this.handleBrowseFiles(msg.requestId, msg.viewerId, msg.path);
                 break;
             case "relay_ping":
+                if (this.lastPingTime > 0) {
+                    const latencyMs = Date.now() - this.lastPingTime;
+                    trackCliEvent("cli_relay_latency", { latencyMs });
+                    Sentry.setMeasurement("relay.ping_latency", latencyMs, "millisecond");
+                }
+                this.lastPingTime = Date.now();
                 this.send({ type: "cli_pong" });
                 this.resetPongTimer();
                 break;
@@ -376,15 +439,19 @@ export class RelayClient extends EventEmitter {
             worktree: msg.worktreeDefaults,
         });
     }
+    // TODO: Web app polls this every 5s (code-relay-server epics.ts refreshSessionsPollingEpic).
+    // Consider increasing interval to 30-60s or switching to push-based updates.
     async handleListDrivers(viewerId) {
-        const allDrivers = getAllDrivers();
-        const drivers = await Promise.all(allDrivers.map(async (d) => ({
-            name: d.name,
-            displayName: d.displayName,
-            installed: await d.checkInstalled(),
-            models: d.listModels(),
-        })));
-        this.send({ type: "cli_drivers_result", viewerId, drivers });
+        if (!this.cachedDriversResult) {
+            const allDrivers = getAllDrivers();
+            this.cachedDriversResult = await Promise.all(allDrivers.map(async (d) => ({
+                name: d.name,
+                displayName: d.displayName,
+                installed: await d.checkInstalled(),
+                models: d.listModels(),
+            })));
+        }
+        this.send({ type: "cli_drivers_result", viewerId, drivers: this.cachedDriversResult });
     }
     async handleBrowseDir(requestId, viewerId, dirPath) {
         if (!this.browseLimiter.allow(viewerId)) {
@@ -594,8 +661,8 @@ export class RelayClient extends EventEmitter {
         const driverName = msg.driverName || DEFAULT_DRIVER_NAME;
         debugLog(`relay: start planning ticket=${msg.ticketId} iteration=${iteration} cwd=${effectiveCwd} driver=${driverName}${branchName ? ` branch=${branchName}` : ""}`);
         try {
-            // Non-interactive: reduced scrollback to save memory
-            const session = appStore.getState().createSession(driverName, effectiveCwd, undefined, undefined, 500);
+            // Non-interactive: minimal scrollback to save memory (raw output is captured separately)
+            const session = appStore.getState().createSession(driverName, effectiveCwd, undefined, undefined, 1);
             if (!session) {
                 debugLog("relay: failed to create planning session");
                 return;
@@ -632,11 +699,22 @@ export class RelayClient extends EventEmitter {
             const command = `${driverName} -p "<planning prompt>"`;
             appStore.getState().setSessionMeta(session.id, { interactive: false, command });
             this.registerSession(session.id);
+            // Safety timeout: force-close planning sessions that run too long
+            const PLANNING_TIMEOUT_MS = 10 * 60 * 1000;
+            const safetyTimer = setTimeout(() => {
+                rawUnsub();
+                rawOutput = "";
+                if (getSessionInstance(session.id)) {
+                    debugLog(`relay: planning session ${session.id} timed out after 10min, force closing`);
+                    appStore.getState().closeSession(session.id);
+                }
+            }, PLANNING_TIMEOUT_MS);
             // In print mode, claude -p exits when done — listen for exit
             const onExit = () => {
+                clearTimeout(safetyTimer);
                 rawUnsub();
                 // Strip ANSI escape sequences from raw PTY output
-                const plainText = rawOutput.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").trim();
+                const plainText = stripAnsi(rawOutput).trim();
                 ticketTracker.updateStatus(msg.ticketId, "plan_ready");
                 this.send({
                     type: "cli_plan_ready",
@@ -803,9 +881,13 @@ export class RelayClient extends EventEmitter {
             });
             this.registerSession(session.id);
             // Monitor session status for implementation completion
+            const cleanup = () => {
+                session.removeListener("status", onStatus);
+                session.removeListener("exit", onExitFallback);
+            };
             const onStatus = (status) => {
                 if (status === "waiting_input" || status === "exited") {
-                    session.removeListener("status", onStatus);
+                    cleanup();
                     const plainText = session.getPlainText(500).join("\n");
                     ticketTracker.updateStatus(msg.ticketId, "done");
                     this.send({
@@ -824,7 +906,26 @@ export class RelayClient extends EventEmitter {
                     });
                 }
             };
+            const onExitFallback = () => {
+                cleanup();
+                ticketTracker.updateStatus(msg.ticketId, "done");
+                this.send({
+                    type: "cli_implementation_done",
+                    ticketId: msg.ticketId,
+                    sessionId: session.id,
+                    summary: "(session exited)",
+                    gitContext: { branch: branchName ?? undefined },
+                });
+                this.send({
+                    type: "cli_ticket_status",
+                    ticketId: msg.ticketId,
+                    sessionId: session.id,
+                    status: "done",
+                    branchName: branchName ?? undefined,
+                });
+            };
             session.on("status", onStatus);
+            session.once("exit", onExitFallback);
         }
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
@@ -918,6 +1019,7 @@ export class RelayClient extends EventEmitter {
     // Encrypted PTY data sending
     // -------------------------------------------------------------------------
     async sendPtyData(tracked, rawData) {
+        const encryptStart = performance.now();
         if (tracked.sck) {
             // E2E enabled — encrypt with SCK
             try {
@@ -930,6 +1032,16 @@ export class RelayClient extends EventEmitter {
                     data: encrypted,
                     seq,
                 });
+                // Sample 1 in 100 to avoid event flood
+                if (Math.random() < 0.01) {
+                    const encryptMs = performance.now() - encryptStart;
+                    trackCliEvent("cli_pty_data_sent", {
+                        sessionId: tracked.sessionId,
+                        dataLenBytes: rawData.length,
+                        encrypted: true,
+                        encryptMs: Math.round(encryptMs * 100) / 100,
+                    });
+                }
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
@@ -950,6 +1062,15 @@ export class RelayClient extends EventEmitter {
                 sessionId: tracked.sessionId,
                 data: base64,
             });
+            // Sample 1 in 100 to avoid event flood
+            if (Math.random() < 0.01) {
+                trackCliEvent("cli_pty_data_sent", {
+                    sessionId: tracked.sessionId,
+                    dataLenBytes: rawData.length,
+                    encrypted: false,
+                    encryptMs: 0,
+                });
+            }
         }
     }
     async sendEncryptedReplay(tracked) {
@@ -1222,6 +1343,10 @@ export class RelayClient extends EventEmitter {
         this.reconnectAttempt++;
         debugLog(`relay: reconnecting in ${delay}ms (attempt ${this.reconnectAttempt})`);
         setRelayConnectionStatus("connecting", undefined, this.reconnectAttempt);
+        trackCliEvent("cli_relay_reconnect", {
+            attempt: this.reconnectAttempt,
+            delayMs: delay,
+        });
         this.reconnectTimer = setTimeout(() => {
             this.reconnectTimer = null;
             if (this.shouldReconnect) {