viveworker 0.8.3 → 0.8.4

package/README.md

@@ -284,6 +284,8 @@ Typical commands:
 - `npx viveworker share upload report.pdf --password "hunter2" --expires-days 7`
 - `npx viveworker share upload deck_standalone.html --no-optimize`
 - `npx viveworker share list`
+- `npx viveworker share replace <slug> updated-report.html`
+- `npx viveworker share update <slug> --file updated-report.html`
 - `npx viveworker share update <slug> --password "hunter2"`
 - `npx viveworker share update <slug> --expires-days 7`
 - `npx viveworker share link <slug>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viveworker",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Open mobile control surface for Codex, Claude, Thread Sharing, File Share, Moltbook, and A2A tasks on your trusted LAN.",
   "author": "Yuta Hoshino <hoshino.lireneo@gmail.com>",
   "license": "MIT",

package/scripts/share-cli.mjs

@@ -9,7 +9,8 @@
  * Commands:
  *   viveworker share upload <file> [--password <pw>] [--price <usd> --pay-to <0x…>] [--expires-days <n>] [--no-optimize] [--json]
  *   viveworker share list [--json]
- *   viveworker share update <slug> [--password <pw>] [--no-password] [--price <usd>] [--no-price] [--pay-to <0x…>] [--expires-days <n>] [--json]
+ *   viveworker share update <slug> [--file <file>] [--password <pw>] [--no-password] [--price <usd>] [--no-price] [--pay-to <0x…>] [--expires-days <n>] [--no-optimize] [--json]
+ *   viveworker share replace <slug> <file> [--expires-days <n>] [--no-optimize] [--json]
  *   viveworker share link <slug> --password <pw> [--ttl-hours <n>] [--json]
  *   viveworker share pay <url> [--output <file>] [--dry-run] [--wallet eoa|hazbase] [--no-approval] [--json]
  *   viveworker share delete <slug>
@@ -80,6 +81,8 @@ export async function runShareCli(args) {
       return handleList(args.slice(1));
     case "update":
       return handleUpdate(args.slice(1));
+    case "replace":
+      return handleReplace(args.slice(1));
     case "link":
       return handleLink(args.slice(1));
     case "pay":
@@ -99,7 +102,8 @@ function printHelp() {
   console.log("Commands:");
   console.log("  viveworker share upload <file> [--password <pw>] [--price <usd> --pay-to <0x…>] [--expires-days <n>] [--no-optimize] [--json]");
   console.log("  viveworker share list [--metrics] [--json]");
-  console.log("  viveworker share update <slug> [--password <pw>] [--no-password] [--price <usd>] [--no-price] [--pay-to <0x…>] [--expires-days <n>] [--json]");
+  console.log("  viveworker share update <slug> [--file <file>] [--password <pw>] [--no-password] [--price <usd>] [--no-price] [--pay-to <0x…>] [--expires-days <n>] [--no-optimize] [--json]");
+  console.log("  viveworker share replace <slug> <file> [--expires-days <n>] [--no-optimize] [--json]");
   console.log("  viveworker share link <slug> --password <pw> [--ttl-hours <n>] [--json]");
   console.log("  viveworker share pay <url> [--output <file>] [--dry-run] [--no-approval] [--json]");
   console.log("  viveworker share delete <slug>");
@@ -133,28 +137,6 @@ async function handleUpload(args) {
     throw new Error("Usage: viveworker share upload <file> [--password <pw>] [--expires-days <n>]");
   }
 
-  const absolute = path.resolve(filePath);
-  let stat;
-  try {
-    stat = await fs.stat(absolute);
-  } catch {
-    throw new Error(`File not found: ${filePath}`);
-  }
-  if (!stat.isFile()) {
-    throw new Error(`Not a regular file: ${filePath}`);
-  }
-  if (stat.size === 0) {
-    throw new Error(`File is empty: ${filePath}`);
-  }
-  const ext = path.extname(absolute).toLowerCase();
-  if (!ALLOWED_EXTENSIONS.includes(ext)) {
-    throw new Error(
-      `Accepted file types: ${ALLOWED_EXTENSIONS.join(" / ")}. ` +
-      `Got: ${ext || "(no extension)"}`
-    );
-  }
-  const { mime } = SHARE_TYPES[ext];
-
   const password = flags["password"] || "";
   const expiresDays = flags["expires-days"] || flags["expiresDays"] || "";
   const price = flags["price"] || "";
@@ -190,21 +172,10 @@ async function handleUpload(args) {
 
   const { apiKey, userId, shareUrl } = await resolveCredentials();
 
-  const originalBytes = await fs.readFile(absolute);
-  const optimization =
-    flags["no-optimize"] || flags["noOptimize"]
-      ? { bytes: originalBytes, info: null }
-      : maybeOptimizeUpload({ absolute, ext, bytes: originalBytes });
-  const bytes = optimization.bytes;
-  if (bytes.length > MAX_FILE_SIZE) {
-    const detail = optimization.info
-      ? ` after optimization to ${formatSize(bytes.length)}`
-      : "";
-    throw new Error(`File too large (${originalBytes.length} bytes, max ${MAX_FILE_SIZE})${detail}`);
-  }
+  const preparedFile = await prepareShareFile(filePath, flags);
   const form = new FormData();
-  const blob = new Blob([bytes], { type: mime });
-  const file = new File([blob], path.basename(absolute), { type: mime });
+  const blob = new Blob([preparedFile.bytes], { type: preparedFile.mime });
+  const file = new File([blob], path.basename(preparedFile.absolute), { type: preparedFile.mime });
   form.set("file", file);
   if (password) form.set("password", password);
   if (expiresDays) form.set("expiresDays", String(expiresDays));
@@ -233,14 +204,14 @@ async function handleUpload(args) {
   }
 
   console.log("");
-  console.log(`✅ Uploaded ${body.originalName || path.basename(absolute)} (${formatSize(body.size)})`);
+  console.log(`✅ Uploaded ${body.originalName || path.basename(preparedFile.absolute)} (${formatSize(body.size)})`);
   console.log("");
-  if (optimization.info) {
+  if (preparedFile.optimization.info) {
     console.log(
-      `   Optimized HTML: ${formatSize(optimization.info.originalBytes)} → ${formatSize(optimization.info.optimizedBytes)}`
+      `   Optimized HTML: ${formatSize(preparedFile.optimization.info.originalBytes)} → ${formatSize(preparedFile.optimization.info.optimizedBytes)}`
     );
     console.log(
-      `   Removed embedded fonts: ${optimization.info.removedFonts}`
+      `   Removed embedded fonts: ${preparedFile.optimization.info.removedFonts}`
     );
     console.log("");
   }
@@ -262,6 +233,44 @@ async function handleUpload(args) {
   console.log("");
 }
 
+async function prepareShareFile(filePath, flags = {}) {
+  const absolute = path.resolve(String(filePath || ""));
+  let stat;
+  try {
+    stat = await fs.stat(absolute);
+  } catch {
+    throw new Error(`File not found: ${filePath}`);
+  }
+  if (!stat.isFile()) {
+    throw new Error(`Not a regular file: ${filePath}`);
+  }
+  if (stat.size === 0) {
+    throw new Error(`File is empty: ${filePath}`);
+  }
+  const ext = path.extname(absolute).toLowerCase();
+  if (!ALLOWED_EXTENSIONS.includes(ext)) {
+    throw new Error(
+      `Accepted file types: ${ALLOWED_EXTENSIONS.join(" / ")}. ` +
+      `Got: ${ext || "(no extension)"}`
+    );
+  }
+  const { mime } = SHARE_TYPES[ext];
+  const originalBytes = await fs.readFile(absolute);
+  const optimization =
+    flags["no-optimize"] || flags["noOptimize"]
+      ? { bytes: originalBytes, info: null }
+      : maybeOptimizeUpload({ absolute, ext, bytes: originalBytes });
+  const bytes = optimization.bytes;
+  if (bytes.length > MAX_FILE_SIZE) {
+    const detail = optimization.info
+      ? ` after optimization to ${formatSize(bytes.length)}`
+      : "";
+    throw new Error(`File too large (${originalBytes.length} bytes, max ${MAX_FILE_SIZE})${detail}`);
+  }
+
+  return { absolute, ext, mime, bytes, optimization };
+}
+
 function maybeOptimizeUpload({ absolute, ext, bytes }) {
   if (ext !== ".html" && ext !== ".htm") {
     return { bytes, info: null };
@@ -506,15 +515,34 @@ function printMetricsSection(metrics, err) {
 
 async function handleUpdate(args) {
   const flags = parseFlags(args);
+  return handleUpdateWithFlags(flags, "update");
+}
+
+async function handleReplace(args) {
+  const flags = parseFlags(args);
+  const slug = flags._[0];
+  const filePath = flags._[1] || flags.file || flags.f;
+  if (!slug || !filePath || flags._.length > 2) {
+    throw new Error("Usage: viveworker share replace <slug> <file> [--expires-days <n>] [--no-optimize] [--json]");
+  }
+  flags._ = [slug];
+  flags.file = filePath;
+  return handleUpdateWithFlags(flags, "replace");
+}
+
+async function handleUpdateWithFlags(flags, mode = "update") {
   const slug = flags._[0];
   if (!slug) {
     throw new Error(
-      "Usage: viveworker share update <slug> [--password <pw>] [--no-password] [--price <usd>] [--no-price] [--pay-to <0x…>] [--expires-days <n>]"
+      "Usage: viveworker share update <slug> [--file <file>] [--password <pw>] [--no-password] [--price <usd>] [--no-price] [--pay-to <0x…>] [--expires-days <n>] [--no-optimize]"
     );
   }
   if (!/^[A-Za-z0-9]+$/.test(slug)) {
     throw new Error(`Invalid slug: ${slug}`);
   }
+  if (flags._.length > 1) {
+    throw new Error("Unexpected positional argument. Use `share replace <slug> <file>` or `share update <slug> --file <file>`.");
+  }
 
   const hasPassword = Object.prototype.hasOwnProperty.call(flags, "password");
   const hasNoPassword = Object.prototype.hasOwnProperty.call(flags, "no-password");
@@ -525,6 +553,9 @@ async function handleUpdate(args) {
     Object.prototype.hasOwnProperty.call(flags, "noPrice");
   const hasPayTo = Object.prototype.hasOwnProperty.call(flags, "pay-to") ||
     Object.prototype.hasOwnProperty.call(flags, "payTo");
+  const hasFile = Object.prototype.hasOwnProperty.call(flags, "file") ||
+    Object.prototype.hasOwnProperty.call(flags, "f");
+  const filePath = flags.file || flags.f || "";
 
   if (hasPassword && hasNoPassword) {
     throw new Error("Pass either --password OR --no-password, not both");
@@ -535,9 +566,12 @@ async function handleUpdate(args) {
   if (hasPrice && hasPassword) {
     throw new Error("--price and --password cannot be combined on a single share");
   }
-  if (!hasPassword && !hasNoPassword && !hasExpires && !hasPrice && !hasNoPrice && !hasPayTo) {
+  if (hasFile && (typeof filePath !== "string" || filePath.length === 0)) {
+    throw new Error("--file requires a path");
+  }
+  if (!hasPassword && !hasNoPassword && !hasExpires && !hasPrice && !hasNoPrice && !hasPayTo && !hasFile) {
     throw new Error(
-      "Nothing to update — specify at least one of --password <pw>, --no-password, --price <usd>, --no-price, --pay-to <0x…>, --expires-days <n>"
+      "Nothing to update — specify at least one of --file <file>, --password <pw>, --no-password, --price <usd>, --no-price, --pay-to <0x…>, --expires-days <n>"
     );
   }
 
@@ -603,19 +637,44 @@ async function handleUpdate(args) {
 
   const { apiKey, userId, shareUrl } = await resolveCredentials();
 
-  const res = await fetchWithTimeout(`${shareUrl}/api/share/${encodeURIComponent(slug)}`, {
-    method: "PATCH",
-    headers: {
+  let preparedFile = null;
+  let requestBody;
+  let requestHeaders;
+  let timeoutMs;
+  if (hasFile) {
+    preparedFile = await prepareShareFile(filePath, flags);
+    const form = new FormData();
+    const blob = new Blob([preparedFile.bytes], { type: preparedFile.mime });
+    const file = new File([blob], path.basename(preparedFile.absolute), { type: preparedFile.mime });
+    form.set("file", file);
+    for (const [key, value] of Object.entries(body)) {
+      form.set(key, value === null ? "" : String(value));
+    }
+    requestBody = form;
+    requestHeaders = {
+      "x-a2a-user": userId,
+      "x-a2a-key": apiKey,
+    };
+    timeoutMs = 60_000;
+  } else {
+    requestBody = JSON.stringify(body);
+    requestHeaders = {
       "content-type": "application/json",
       "x-a2a-user": userId,
       "x-a2a-key": apiKey,
-    },
-    body: JSON.stringify(body),
-  }, 30_000);
+    };
+    timeoutMs = 30_000;
+  }
+
+  const res = await fetchWithTimeout(`${shareUrl}/api/share/${encodeURIComponent(slug)}`, {
+    method: "PATCH",
+    headers: requestHeaders,
+    body: requestBody,
+  }, timeoutMs);
 
   const respBody = await readJson(res);
   if (!res.ok || respBody.error) {
-    throw new Error(formatApiError("Update", res.status, respBody));
+    throw new Error(formatApiError(mode === "replace" ? "Replace" : "Update", res.status, respBody));
   }
 
   if (flags.json) {
@@ -624,17 +683,25 @@ async function handleUpdate(args) {
   }
 
   console.log("");
-  console.log(`✅ Updated ${slug}`);
+  console.log(hasFile ? `✅ Replaced file for ${slug}` : `✅ Updated ${slug}`);
   console.log("");
   console.log(`   ${respBody.url}`);
   console.log("");
+  if (hasFile) {
+    console.log(`   File: ${respBody.originalName || path.basename(preparedFile.absolute)} (${formatSize(respBody.size || preparedFile.bytes.length)})`);
+    if (preparedFile.optimization.info) {
+      console.log(
+        `   Optimized HTML: ${formatSize(preparedFile.optimization.info.originalBytes)} → ${formatSize(preparedFile.optimization.info.optimizedBytes)}`
+      );
+    }
+  }
   if (respBody.hasPassword) {
     console.log(`   🔒 Password-protected${hasPassword ? " (existing unlock cookies invalidated)" : ""}`);
   } else if (hasNoPassword) {
     console.log(`   🔓 Password removed`);
   }
   if (respBody.price && respBody.payTo) {
-    const rotated = hasPrice ? " (paid sessions invalidated)" : "";
+    const rotated = hasPrice || respBody.paymentSessionsInvalidated ? " (paid sessions invalidated)" : "";
     console.log(
       `   💰 Paid — ${formatUsdc(respBody.price)} USDC on ${respBody.network || "?"} → ${respBody.payTo}${rotated}`
     );
@@ -1181,6 +1248,12 @@ function formatApiError(op, status, body) {
       return `${op} failed (${status}): file count exceeded — ${body.current}/${body.max}. Delete something first.`;
     case "file-too-large":
       return `${op} failed (${status}): file too large (max ${formatSize(body.maxBytes)})`;
+    case "empty-file":
+      return `${op} failed (${status}): file is empty`;
+    case "invalid-form-data":
+      return `${op} failed (${status}): invalid multipart form data`;
+    case "invalid-file-field":
+      return `${op} failed (${status}): invalid file field`;
     case "unsupported-extension":
       return `${op} failed (${status}): unsupported file type. Accepted: ${(body.allowed || []).join(" / ") || "n/a"}`;
     case "unsupported-content-type":

package/scripts/viveworker-bridge.mjs

@@ -9631,6 +9631,15 @@ function isStartTurnAckTimeout(errorValue) {
     message === "turn/start-timeout";
 }
 
+function isIpcNoClientFoundError(errorValue) {
+  const message = normalizeIpcErrorMessage(errorValue).toLowerCase();
+  return message === "no-client-found" ||
+    message === "client-not-found" ||
+    message === "target-client-not-found" ||
+    message.includes("no client found") ||
+    message.includes("client not found");
+}
+
 function buildDefaultCollaborationMode(threadState) {
   // Fallback turns must leave Plan mode unless the caller explicitly opts in.
   return buildRequestedCollaborationMode(threadState, "default");
@@ -9749,14 +9758,36 @@ class NativeIpcClient {
     );
   }
 
-  sendThreadFollowerRequest(method, params, conversationId, ownerClientId = null, options = {}) {
-    return this.sendRequest(method, params, {
-      targetClientId:
-        ownerClientId ??
-        this.runtime.threadOwnerClientIds.get(conversationId) ??
-        null,
-      ...options,
-    });
+  async sendThreadFollowerRequest(method, params, conversationId, ownerClientId = null, options = {}) {
+    const targetClientId =
+      ownerClientId ??
+      this.runtime.threadOwnerClientIds.get(conversationId) ??
+      null;
+
+    try {
+      return await this.sendRequest(method, params, {
+        targetClientId,
+        ...options,
+      });
+    } catch (error) {
+      if (!targetClientId || !isIpcNoClientFoundError(error)) {
+        throw error;
+      }
+
+      const mappedOwner = this.runtime.threadOwnerClientIds.get(conversationId) ?? null;
+      if (mappedOwner === targetClientId) {
+        this.runtime.threadOwnerClientIds.delete(conversationId);
+      }
+      console.warn(
+        `[ipc] stale owner client for thread=${cleanText(conversationId || "") || "unknown"} ` +
+        `target=${cleanText(targetClientId || "") || "unknown"} method=${cleanText(method || "") || "unknown"}; retrying without target`
+      );
+
+      return this.sendRequest(method, params, {
+        ...options,
+        targetClientId: null,
+      });
+    }
   }
 
   sendRequest(method, params, options = {}) {
@@ -19041,6 +19072,9 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
           if (error.message === "codex-ipc-not-connected") {
             return writeJson(res, 503, { error: error.message });
           }
+          if (isIpcNoClientFoundError(error)) {
+            return writeJson(res, 503, { error: "codex-client-not-found" });
+          }
           return writeJson(res, 500, { error: error.message });
         }
       }

package/web/app.js

@@ -43,6 +43,7 @@ const DETAIL_REFRESH_FALLBACK_TIMEOUT_MS = 2_500;
 const DETAIL_STICKY_LAN_PROBE_TIMEOUT_MS = 350;
 const COMPLETION_REPLY_SEND_TIMEOUT_MS = 22_000;
 const COMPLETION_REPLY_OPTIMISTIC_SENT_MS = 1_600;
+const LAN_FETCH_TIMEOUT_MESSAGE = "LAN fetch timed out";
 const TIMELINE_REFRESH_TIMEOUT_MS = 8_000;
 const TIMELINE_POLL_TIMEOUT_MS = 4_500;
 const FAST_POLL_STEP_TIMEOUT_MS = 4_500;
@@ -2755,6 +2756,11 @@ function completionReplyWarningMatchesSentText(error, text, attachmentCount = 0)
   return Boolean(warningText && sentText && warningText === sentText);
 }
 
+function isCompletionReplyLateNetworkResult(error) {
+  return error?.errorKey === "request-timeout" ||
+    error?.message === LAN_FETCH_TIMEOUT_MESSAGE;
+}
+
 function normalizeCompletionReplyAttachments(values) {
   const rawValues = Array.isArray(values)
     ? values
@@ -10027,7 +10033,7 @@ for (const button of document.querySelectorAll("[data-wallet-address-copy]")) {
       } catch (error) {
         const optimisticDraft = getCompletionReplyDraft(token);
         if (
-          error.errorKey === "request-timeout" &&
+          isCompletionReplyLateNetworkResult(error) &&
           optimisticDraft.collapsedAfterSend &&
           optimisticDraft.sentText === text
         ) {
@@ -11504,6 +11510,7 @@ function localizeApiError(value) {
     "completion-reply-image-limit": "error.completionReplyImageLimit",
     "completion-reply-image-invalid-upload": "error.completionReplyImageInvalidUpload",
     "codex-ipc-not-connected": "error.codexIpcNotConnected",
+    "codex-client-not-found": "error.codexClientNotFound",
     "approval-not-found": "error.approvalNotFound",
     "approval-already-handled": "error.approvalAlreadyHandled",
     "plan-request-not-found": "error.planRequestNotFound",

package/web/build-id.js

@@ -1 +1 @@
-export const APP_BUILD_ID = "20260509-remote-lan-relay-guard";
+export const APP_BUILD_ID = "20260514-lan-timeout-reply-ack";

package/web/i18n.js

@@ -758,6 +758,7 @@ const translations = {
     "error.completionReplyImageLimit": "Attach up to {count} images at a time.",
     "error.completionReplyImageInvalidUpload": "That image could not be uploaded.",
     "error.codexIpcNotConnected": "Codex desktop is not connected right now.",
+    "error.codexClientNotFound": "Codex changed its active client. Reopen the thread on your PC and try again.",
     "error.approvalNotFound": "This approval is no longer available.",
     "error.approvalAlreadyHandled": "This approval was already handled.",
     "error.planRequestNotFound": "This plan request is no longer available.",
@@ -1835,6 +1836,7 @@ const translations = {
     "error.completionReplyImageLimit": "画像は最大 {count} 枚まで添付できます。",
     "error.completionReplyImageInvalidUpload": "この画像はアップロードできませんでした。",
     "error.codexIpcNotConnected": "いまは Codex desktop に接続できていません。",
+    "error.codexClientNotFound": "Codex 側の接続先が切り替わりました。PC で対象スレッドを開き直して、もう一度送信してください。",
     "error.approvalNotFound": "この承認はもう利用できません。",
     "error.approvalAlreadyHandled": "この承認はすでに処理済みです。",
     "error.planRequestNotFound": "このプラン確認はもう利用できません。",

package/web/remote-pairing/transport.js

@@ -88,6 +88,7 @@ const DEFAULT_FAILURE_WINDOW_MS = 60_000;
 const DEFAULT_FAILURE_THRESHOLD = 4;
 const DEFAULT_CIRCUIT_BREAKER_MS = 60_000;
 const DEFAULT_MAX_CIRCUIT_BREAKER_MS = 10 * 60_000;
+const DEFAULT_STABLE_CONNECTION_MS = 15_000;
 const DEFAULT_PROLOGUE = new TextEncoder().encode("viveworker/remote-pairing/v1");
 
 // CloseEvent codes we emit. 1000 is normal; 4xxx is application-defined.
@@ -121,6 +122,7 @@ const CLOSE_RELAY_RESET_SESSION = 4004;
  * @property {number} [failureThreshold]
  * @property {number} [circuitBreakerMs]
  * @property {number} [maxCircuitBreakerMs]
+ * @property {number} [stableConnectionMs]
  * @property {typeof WebSocket} [WebSocketImpl]     injectable for Node-side tests
  * @property {{debug?: Function, warn?: Function}} [logger]
  */
@@ -166,6 +168,7 @@ export class RemotePairingTransport {
     this._failureThreshold = opts.failureThreshold ?? DEFAULT_FAILURE_THRESHOLD;
     this._circuitBreakerMs = opts.circuitBreakerMs ?? DEFAULT_CIRCUIT_BREAKER_MS;
     this._maxCircuitBreakerMs = opts.maxCircuitBreakerMs ?? DEFAULT_MAX_CIRCUIT_BREAKER_MS;
+    this._stableConnectionMs = opts.stableConnectionMs ?? DEFAULT_STABLE_CONNECTION_MS;
 
     this._WebSocketImpl = opts.WebSocketImpl ?? globalThis.WebSocket;
     if (typeof this._WebSocketImpl !== "function") {
@@ -200,6 +203,8 @@ export class RemotePairingTransport {
     this._pingTimer = null;
     /** @type {ReturnType<typeof setTimeout> | null} */
     this._handshakeTimer = null;
+    /** @type {ReturnType<typeof setTimeout> | null} */
+    this._stableConnectionTimer = null;
     /** @type {number[]} recent reconnect-triggering failures. */
     this._recentFailureAtMs = [];
     /** If > Date.now(), reconnect attempts are intentionally delayed. */
@@ -317,6 +322,7 @@ export class RemotePairingTransport {
     this._closed = true;
     this._started = false;
     this._cancelReconnectTimer();
+    this._cancelStableConnectionTimer();
     this._stopPing();
     this._stopHandshakeTimer();
     if (this._ws) {
@@ -682,6 +688,24 @@ export class RemotePairingTransport {
     }
   }
 
+  _scheduleStableConnectionReset() {
+    const delay = Math.max(0, Number(this._stableConnectionMs) || 0);
+    this._stableConnectionTimer = setTimeout(() => {
+      this._stableConnectionTimer = null;
+      if (this._closed || this._state !== STATE.CONNECTED) return;
+      this._recentFailureAtMs = [];
+      this._circuitOpenUntilMs = 0;
+      this._circuitOpenCount = 0;
+    }, delay);
+  }
+
+  _cancelStableConnectionTimer() {
+    if (this._stableConnectionTimer != null) {
+      clearTimeout(this._stableConnectionTimer);
+      this._stableConnectionTimer = null;
+    }
+  }
+
   _startPing() {
     this._stopPing();
     this._pingTimer = setInterval(() => {
@@ -742,11 +766,10 @@ export class RemotePairingTransport {
     if (this._state === newState) return;
     const prev = this._state;
     this._state = newState;
+    this._cancelStableConnectionTimer();
     if (newState === STATE.CONNECTED) {
       this._reconnectAttempt = 0;
-      this._recentFailureAtMs = [];
-      this._circuitOpenUntilMs = 0;
-      this._circuitOpenCount = 0;
+      this._scheduleStableConnectionReset();
     }
     try {
       this._onStateChange(newState, prev, info);
@@ -771,6 +794,7 @@ export class RemotePairingTransport {
     this._stopPing();
     this._stopHandshakeTimer();
     this._cancelReconnectTimer();
+    this._cancelStableConnectionTimer();
     if (this._ws) {
       try { this._ws.close(CLOSE_FATAL, "fatal-error"); } catch {}
       this._ws = null;