viveworker 0.8.2 → 0.8.3

package/web/app.css

@@ -2755,6 +2755,39 @@ pre code {
   color: rgba(236, 248, 255, 0.66);
 }
 
+.timeline-entry--activity {
+  cursor: default;
+  border-color: rgba(121, 196, 255, 0.18);
+  background:
+    linear-gradient(180deg, rgba(121, 196, 255, 0.11), rgba(20, 31, 40, 0.94)),
+    var(--card);
+}
+
+.timeline-entry__activity-pulse {
+  width: 0.58rem;
+  height: 0.58rem;
+  flex: 0 0 auto;
+  border-radius: 999px;
+  background: rgba(121, 196, 255, 0.9);
+  box-shadow: 0 0 0 0 rgba(121, 196, 255, 0.26);
+  animation: timeline-activity-pulse 1.6s ease-out infinite;
+}
+
+@keyframes timeline-activity-pulse {
+  0% {
+    box-shadow: 0 0 0 0 rgba(121, 196, 255, 0.26);
+    opacity: 0.95;
+  }
+  70% {
+    box-shadow: 0 0 0 0.56rem rgba(121, 196, 255, 0);
+    opacity: 0.72;
+  }
+  100% {
+    box-shadow: 0 0 0 0 rgba(121, 196, 255, 0);
+    opacity: 0.95;
+  }
+}
+
 .timeline-entry--message .timeline-entry__title {
   font-size: 1.03rem;
   line-height: 1.55;

package/web/app.js

@@ -897,7 +897,7 @@ async function forceAppRefreshFromLan() {
       const keys = await caches.keys();
       await Promise.all(
         keys
-          .filter((key) => /^viveworker-v/.test(key))
+          .filter((key) => /^viveworker-/u.test(key))
           .map((key) => caches.delete(key))
       );
     }
@@ -1930,17 +1930,26 @@ function currentTimelineKindFilterOption() {
 
 function timelineEntryMatchesKindFilter(entry, filterId) {
   const kind = normalizeClientText(entry?.kind || entry?.item?.kind || "");
+  const fileEventType = normalizeClientText(entry?.fileEventType || entry?.item?.fileEventType || "");
+  const activityPhase = normalizeClientText(entry?.activityPhase || entry?.item?.activityPhase || "");
   switch (filterId) {
     case "messages":
-      return TIMELINE_MESSAGE_KINDS.has(kind);
+      return TIMELINE_MESSAGE_KINDS.has(kind) || (kind === "activity_status" && activityPhase === "thinking");
     case "suggestions":
       return kind === "ambient_suggestions";
     case "files":
-      return kind === "file_event";
+      return (
+        (kind === "file_event" && fileEventType !== "git") ||
+        (kind === "activity_status" && ["reading", "searching", "editing"].includes(activityPhase))
+      );
     case "commands":
-      return kind === "command_event";
+      return (
+        kind === "command_event" ||
+        (kind === "file_event" && fileEventType === "git") ||
+        (kind === "activity_status" && activityPhase === "running_command")
+      );
     case "approvals":
-      return kind === "approval";
+      return kind === "approval" || (kind === "activity_status" && activityPhase === "awaiting_approval");
     case "plans":
       return kind === "plan" || kind === "plan_ready";
     case "choices":
@@ -3773,6 +3782,7 @@ function renderTimelineEntry(entry, { desktop }) {
   const isMessageLike = TIMELINE_MESSAGE_KINDS.has(item.kind) || isMoltbookOrA2A;
   const isFileEvent = item.kind === "file_event";
   const isCommandEvent = item.kind === "command_event";
+  const isActivityStatus = item.kind === "activity_status";
   const imageUrls = Array.isArray(item.imageUrls) ? item.imageUrls.filter(Boolean) : [];
   const fileRefs = normalizeClientFileRefs(item.fileRefs);
   const primaryText = timelineEntryPrimaryText(item, entry.status, { isMessageLike, isFileEvent, isCommandEvent });
@@ -3783,13 +3793,15 @@ function renderTimelineEntry(entry, { desktop }) {
   const fileEventFileSummary = isFileEvent ? timelineFileEventFileSummary(item) : "";
   const fileEventDiffStatsHtml = isFileEvent ? renderDiffEntryStatsHtml(item) : "";
   const toolEventCommand = timelineToolEventCommand(item);
+  const tagName = isActivityStatus ? "div" : "button";
+  const openAttrs = isActivityStatus
+    ? `role="status" aria-live="polite"`
+    : `data-open-item-kind="${escapeHtml(item.kind)}" data-open-item-token="${escapeHtml(item.token)}" data-source-tab="timeline"`;
 
   return `
-    <button
-      class="timeline-entry timeline-entry--${kindClassName} timeline-entry--kind-${kindNameClass} ${isMessageLike ? "timeline-entry--message" : "timeline-entry--operational"}"
-      data-open-item-kind="${escapeHtml(item.kind)}"
-      data-open-item-token="${escapeHtml(item.token)}"
-      data-source-tab="timeline"
+    <${tagName}
+      class="timeline-entry timeline-entry--${kindClassName} timeline-entry--kind-${kindNameClass} ${isMessageLike ? "timeline-entry--message" : "timeline-entry--operational"} ${isActivityStatus ? "timeline-entry--activity" : ""}"
+      ${openAttrs}
     >
       <div class="timeline-entry__meta">
         <span class="timeline-entry__kind">
@@ -3799,7 +3811,7 @@ function renderTimelineEntry(entry, { desktop }) {
         </span>
         <span class="timeline-entry__meta-right">
           <span class="timeline-entry__time">${escapeHtml(timestampLabel)}</span>
-          <span class="timeline-entry__chevron" aria-hidden="true">${renderIcon("chevron-right")}</span>
+          ${isActivityStatus ? `<span class="timeline-entry__activity-pulse" aria-hidden="true"></span>` : `<span class="timeline-entry__chevron" aria-hidden="true">${renderIcon("chevron-right")}</span>`}
         </span>
       </div>
       ${threadLabel ? `<p class="timeline-entry__thread">${escapeHtml(threadLabel)}</p>` : ""}
@@ -3821,7 +3833,7 @@ function renderTimelineEntry(entry, { desktop }) {
         ${isFileEvent ? "" : renderTimelineEntryFileStrip(fileRefs)}
       </div>
       ${statusLabel ? `<div class="timeline-entry__footer"><span class="timeline-entry__status">${escapeHtml(statusLabel)}</span></div>` : ""}
-    </button>
+    </${tagName}>
   `;
 }
 
@@ -4059,10 +4071,13 @@ function shouldRenderFileEventCommand(item) {
   if (item?.kind !== "file_event") {
     return false;
   }
-  return ["read", "search"].includes(normalizeClientText(item?.fileEventType || ""));
+  return ["read", "search", "git"].includes(normalizeClientText(item?.fileEventType || ""));
 }
 
 function timelineToolEventCommand(item) {
+  if (item?.kind === "activity_status") {
+    return truncateUiText(item?.commandText || "", 220);
+  }
   if (item?.kind === "command_event") {
     return timelineCommandEventCommand(item);
   }
@@ -4078,6 +4093,8 @@ function fileEventDisplayLabel(fileEventType) {
       return L("fileEvent.read");
     case "search":
       return L("fileEvent.search");
+    case "git":
+      return L("fileEvent.command");
     case "command":
       return L("fileEvent.command");
     case "write":
@@ -4095,15 +4112,24 @@ function fileEventDisplayLabel(fileEventType) {
 
 function fileEventTimelineCountLabel(item) {
   const fileEventType = normalizeClientText(item?.fileEventType || "");
-  const count = normalizeClientFileRefs(item?.fileRefs).length;
+  const fileRefs = normalizeClientFileRefs(item?.fileRefs);
+  const count = fileRefs.length;
   if (count <= 0) {
     return fileEventDisplayLabel(fileEventType) || L("common.fileEvent");
   }
   switch (fileEventType) {
     case "read":
+      if (count === 1) {
+        return L("fileEvent.read");
+      }
       return L("fileEvent.timeline.read", { count });
     case "search":
+      if (count === 1) {
+        return L("fileEvent.search");
+      }
       return L("fileEvent.timeline.search", { count });
+    case "git":
+      return L("fileEvent.timeline.command", { count });
     case "command":
       return L("fileEvent.timeline.command", { count });
     case "write":
@@ -5448,20 +5474,29 @@ function recentAutoPilotEntries(limit = 5) {
 }
 
 function isAutoPilotApprovalEntry(entry) {
+  const mode = normalizeClientText(entry?.autoPilotMode || "");
   const stableId = normalizeClientText(entry?.stableId || "");
   return (
     normalizeClientText(entry?.kind || "") === "approval" &&
     normalizeClientText(entry?.outcome || "") === "approved" &&
-    (stableId.endsWith(":autopilot") || stableId.includes(":autopilot-write"))
+    (mode === "read" || mode === "write" || stableId.endsWith(":autopilot") || stableId.includes(":autopilot-write"))
   );
 }
 
 function autoPilotEntryMode(item) {
+  const mode = normalizeClientText(item?.autoPilotMode || "");
+  if (mode === "read" || mode === "write") {
+    return mode;
+  }
   const stableId = normalizeClientText(item?.stableId || "");
   return stableId.includes(":autopilot-write") ? "write" : "read";
 }
 
 function autoPilotEntryWriteLane(item) {
+  const projected = normalizeClientText(item?.autoPilotWriteLane || "");
+  if (projected) {
+    return projected;
+  }
   const stableId = normalizeClientText(item?.stableId || "");
   const match = stableId.match(/:autopilot-write:([a-z_-]+)$/u);
   return normalizeClientText(match?.[1] || "");
@@ -7627,7 +7662,7 @@ function renderMoltbookDraftComposer(detail, options = {}) {
     ? `
       <div class="actions actions--stack${options.mobile ? " actions--sticky" : ""}">
         <button type="submit" data-action="approve" class="primary primary--wide">${escapeHtml(approveLabel)}</button>
-        <button type="submit" data-action="deny" class="danger danger--wide">Deny</button>
+        <button type="submit" data-action="deny" class="danger danger--wide">${escapeHtml(L("moltbook.draft.deny"))}</button>
       </div>
     `
     : `<p class="muted reply-composer__description">${escapeHtml(L("moltbook.draft.resolved"))}</p>`;
@@ -8800,7 +8835,7 @@ function bindShellInteractions() {
             buildActionOutcomeDetail({
               kind: "approval",
               title: state.currentDetail?.title,
-              message: approvalOutcomeMessage(actionUrl, activeItem?.provider),
+              message: approvalOutcomeMessage(actionUrl, state.currentDetail?.provider || activeItem?.provider),
             })
           );
           await renderShell();
@@ -9712,7 +9747,9 @@ for (const button of document.querySelectorAll("[data-wallet-address-copy]")) {
         labelCache.set(btn, btn.innerHTML);
         btn.disabled = true;
         if (btn.dataset.action === submittedAction) {
-          btn.innerHTML = submittedAction === "approve" ? "送信中…" : "処理中…";
+          btn.innerHTML = submittedAction === "approve"
+            ? escapeHtml(L("moltbook.draft.submittingApprove"))
+            : escapeHtml(L("moltbook.draft.submittingDeny"));
           btn.classList.add("is-loading");
         } else {
           btn.classList.add("is-dimmed");
@@ -10582,6 +10619,8 @@ function kindMeta(kind, item) {
       return { label: L("common.assistantCommentary"), tone: "plan", icon: "assistant-commentary" };
     case "assistant_final":
       return { label: L("common.assistantFinal"), tone: "completion", icon: "assistant-final" };
+    case "activity_status":
+      return { label: L("server.title.activityStatus"), tone: "plan", icon: activityStatusIcon(item?.activityPhase) };
     case "ambient_suggestions":
       return { label: L("common.ambientSuggestions"), tone: "neutral", icon: "suggestions" };
     case "approval":
@@ -10596,6 +10635,9 @@ function kindMeta(kind, item) {
     case "diff_thread":
       return { label: L("common.diff"), tone: "neutral", icon: "diff" };
     case "file_event":
+      if (normalizeClientText(item?.fileEventType || "") === "git") {
+        return { label: L("common.commandEvent"), tone: "neutral", icon: "command" };
+      }
       return { label: L("common.fileEvent"), tone: "neutral", icon: "file-event" };
     case "command_event":
       return { label: L("common.commandEvent"), tone: "neutral", icon: "command" };
@@ -10616,6 +10658,24 @@ function kindMeta(kind, item) {
   }
 }
 
+function activityStatusIcon(phase) {
+  switch (normalizeClientText(phase || "")) {
+    case "reading":
+      return "file-event";
+    case "searching":
+      return "filter";
+    case "editing":
+      return "diff";
+    case "running_command":
+      return "command";
+    case "awaiting_approval":
+      return "approval";
+    case "thinking":
+    default:
+      return "pending";
+  }
+}
+
 function renderTypePillContent(kindInfo) {
   return `
     <span class="type-pill__icon" aria-hidden="true">${renderIcon(kindInfo.icon)}</span>

package/web/build-id.js

@@ -1 +1 @@
-export const APP_BUILD_ID = "20260505-command-event-fast-approval-v1";
+export const APP_BUILD_ID = "20260509-remote-lan-relay-guard";

package/web/i18n.js

@@ -463,7 +463,7 @@ const translations = {
     "settings.row.defaultLanguage": "Setup default",
     "settings.moltbook.title": "Moltbook",
     "settings.moltbook.subtitle": "Auto-scout & notifications",
-    "settings.moltbook.copy": "View your daily auto-scout posting status and quota.",
+    "settings.moltbook.copy": "View incoming reply drafts, feed scouting, and today's posting quota.",
     "settings.moltbook.unavailable": "Moltbook is not configured.",
     "settings.row.moltbookAccount": "Profile",
     "settings.row.moltbookQuota": "Replies today",
@@ -484,6 +484,9 @@ const translations = {
     "moltbook.draft.titleLabel": "Title",
     "moltbook.draft.approvePost": "Approve & publish",
     "moltbook.draft.approveReply": "Approve & post",
+    "moltbook.draft.deny": "Deny",
+    "moltbook.draft.submittingApprove": "Publishing...",
+    "moltbook.draft.submittingDeny": "Denying...",
     "moltbook.draft.editHint": "Edit if needed, then approve to publish or deny to skip.",
     "moltbook.draft.resolved": "This draft has already been resolved.",
     "moltbook.draft.greetMorning": "Good morning! Share yesterday's highlights?",
@@ -780,6 +783,7 @@ const translations = {
     "server.title.userMessage": "User",
     "server.title.assistantCommentary": "Update",
     "server.title.assistantFinal": "Final reply",
+    "server.title.activityStatus": "Working",
     "server.title.ambientSuggestions": "Suggested next steps",
     "server.title.threadShare": "Thread Share",
     "server.action.review": "Review",
@@ -814,6 +818,13 @@ const translations = {
     "server.message.choiceSummarySubmitted": "Selected answers sent.",
     "server.message.choiceSummaryReceivedTest": "Test answers received.",
     "server.message.questionAnswered": "Your answer was sent to {provider}.",
+    "server.activity.thinking": "Thinking...",
+    "server.activity.reading": "Reading files...",
+    "server.activity.searching": "Searching...",
+    "server.activity.editing": "Editing...",
+    "server.activity.runningCommand": "Running command...",
+    "server.activity.awaitingApproval": "Waiting for approval...",
+    "server.activity.working": "Working...",
     "claudePlan.title": "Plan from {provider}",
     "claudePlan.approve": "Approve plan",
     "claudePlan.reject": "Reject plan",
@@ -1529,7 +1540,7 @@ const translations = {
     "settings.row.defaultLanguage": "setup 時の既定値",
     "settings.moltbook.title": "Moltbook",
     "settings.moltbook.subtitle": "自動スカウト・通知連携",
-    "settings.moltbook.copy": "本日の自動スカウト投稿状況と上限を確認できます。",
+    "settings.moltbook.copy": "自分宛コメントの返信案、フィード巡回、本日の投稿上限を確認できます。",
     "settings.moltbook.unavailable": "Moltbook が設定されていません。",
     "settings.row.moltbookAccount": "プロフィール",
     "settings.row.moltbookQuota": "本日の返信数",
@@ -1550,6 +1561,9 @@ const translations = {
     "moltbook.draft.titleLabel": "タイトル",
     "moltbook.draft.approvePost": "承認して投稿",
     "moltbook.draft.approveReply": "承認して返信",
+    "moltbook.draft.deny": "拒否",
+    "moltbook.draft.submittingApprove": "投稿中…",
+    "moltbook.draft.submittingDeny": "拒否中…",
     "moltbook.draft.editHint": "必要に応じて編集し、承認して投稿するか、拒否してスキップします。",
     "moltbook.draft.resolved": "このドラフトは既に処理済みです。",
     "moltbook.draft.greetMorning": "おはようございます！昨日の成果をシェアしませんか？",
@@ -1846,6 +1860,7 @@ const translations = {
     "server.title.userMessage": "ユーザー",
     "server.title.assistantCommentary": "途中経過",
     "server.title.assistantFinal": "最終回答",
+    "server.title.activityStatus": "作業中",
     "server.title.ambientSuggestions": "次の候補",
     "server.title.threadShare": "スレッド共有",
     "server.action.review": "判断する",
@@ -1880,6 +1895,13 @@ const translations = {
     "server.message.choiceSummarySubmitted": "選択内容を送信しました。",
     "server.message.choiceSummaryReceivedTest": "テスト回答を受信しました。",
     "server.message.questionAnswered": "回答を {provider} に送信しました。",
+    "server.activity.thinking": "考え中...",
+    "server.activity.reading": "ファイルを読んでいます...",
+    "server.activity.searching": "検索しています...",
+    "server.activity.editing": "編集中...",
+    "server.activity.runningCommand": "コマンドを実行中...",
+    "server.activity.awaitingApproval": "承認待ち...",
+    "server.activity.working": "作業中...",
     "claudePlan.title": "{provider} からのプラン",
     "claudePlan.approve": "プランを承認",
     "claudePlan.reject": "プランを却下",

package/web/remote-pairing/api-router.js

@@ -13,12 +13,13 @@
  *   2. If LAN throws a `TypeError` (network failure, DNS, connect refused —
  *      i.e. the bridge isn't reachable), fall back to the relay's
  *      `RemotePairingRpcClient.fetch()`.
- *   3. After a LAN failure, enter a STICKY_RELAY_MS window where subsequent
- *      requests skip LAN and go straight to relay. Avoids paying the LAN
- *      timeout cost on every call after we've already learned LAN is dead.
- *   4. When the window expires, the next request re-probes LAN. If LAN is
- *      back, the sticky window is left dormant and we return to the happy
- *      path. If LAN is still dead, the window resets.
+ *   3. After a LAN failure, enter a sticky relay window where subsequent
+ *      requests skip LAN and go straight to relay. If LAN was healthy very
+ *      recently, keep that window short so one transient WiFi wobble doesn't
+ *      make an in-room phone behave like it is off-LAN for minutes.
+ *   4. While sticky relay is active, periodically run a tiny LAN probe. If
+ *      LAN is back, clear sticky state and close the relay client. If LAN is
+ *      still dead, the sticky window resets and relay stays the fast path.
  *   5. AbortError (caller cancelled) is never treated as a LAN failure —
  *      we re-throw immediately rather than waste a relay attempt.
  *
@@ -76,11 +77,9 @@ import { loadPairingState } from "./pairing-state.js";
 // ---------------------------------------------------------------------------
 
 /**
- * After a LAN failure we prefer relay for this long before re-probing LAN.
- * 5 minutes is a coarse pick: long enough that a phone that fell off LAN
- * (cellular handoff, WiFi drop) doesn't pay LAN connect timeouts on every
- * outbound call, short enough that "I just walked back into wifi range"
- * recovers without the user noticing.
+ * Hard upper bound after a LAN failure. We keep this for real off-LAN use so
+ * cellular/remote sessions do not pay LAN connect timeouts on every request.
+ * Recent successful LAN sessions use a much shorter transient window below.
  */
 const STICKY_RELAY_MS = 5 * 60 * 1000;
 
@@ -99,6 +98,20 @@ const DEFAULT_RELAY_TIMEOUT_MS = 60_000;
  */
 const DEFAULT_LAN_TIMEOUT_MS = 2_500;
 const DEFAULT_STICKY_LAN_PROBE_TIMEOUT_MS = 350;
+// Recover quickly from accidentally sticky relay while still avoiding LAN
+// timeout spam during real off-LAN sessions.
+const AUTO_STICKY_LAN_PROBE_INTERVAL_MS = 8_000;
+const AUTO_STICKY_LAN_PROBE_TIMEOUT_MS = 900;
+const LAN_REACHABILITY_PROBE_TIMEOUT_MS = 700;
+const LAN_REACHABILITY_PROBE_PATH = "/health";
+const RECENT_LAN_OK_GRACE_MS = 60_000;
+const TRANSIENT_LAN_FAILURE_STICKY_MS = 8_000;
+const TRANSIENT_LAN_FAILURE_THRESHOLD = 2;
+// If LAN was healthy moments ago, a single timed-out local request is more
+// likely a busy bridge/Safari wobble than a true off-LAN transition. Delay
+// relay fallback for the first few consecutive failures to avoid burning
+// Cloudflare Durable Object quota while the phone is still on trusted LAN.
+const RECENT_LAN_RELAY_SUPPRESSION_FAILURES = 2;
 const RELAY_FAILURE_WINDOW_MS = 60_000;
 const RELAY_FAILURE_THRESHOLD = 6;
 const RELAY_CIRCUIT_BREAKER_MS = 60_000;
@@ -132,6 +145,15 @@ let _lastPairingStateStatus = null;
 /** Last transport route that completed successfully. */
 let _lastSuccessfulRoute = null;
 
+/** Last time a LAN request completed successfully. */
+let _lastLanOkAtMs = 0;
+
+/** Last time we tried a LAN probe while sticky relay was active. */
+let _lastStickyLanProbeAtMs = 0;
+
+/** Consecutive LAN transport failures since the last LAN success. */
+let _consecutiveLanFailures = 0;
+
 /** Recent relay-level failures used to avoid burning relay/DO quota in loops. */
 let _relayFailureAtMs = [];
 
@@ -142,8 +164,10 @@ function newTelemetry() {
   return {
     lanOk: 0,
     lanFail: 0,
+    lanReachableAfterFailure: 0,
     relayOk: 0,
     relayFail: 0,
+    relaySuppressed: 0,
     lastLanFailAt: 0,
     lastRelayFailAt: 0,
     clientResets: 0,
@@ -440,6 +464,29 @@ function relayCircuitError(opts = {}) {
   return err;
 }
 
+function shouldAutoProbeLanWhileSticky(now, opts = {}) {
+  if (opts.autoProbeLanWhileSticky === false) {
+    return false;
+  }
+  if (relayCircuitDelayMs(opts) > 0) {
+    return false;
+  }
+  return now - _lastStickyLanProbeAtMs >= AUTO_STICKY_LAN_PROBE_INTERVAL_MS;
+}
+
+function stickyLanProbeOpts(opts, autoProbe) {
+  if (!autoProbe) {
+    return opts;
+  }
+  if (opts.stickyLanProbeTimeoutMs != null) {
+    return opts;
+  }
+  return {
+    ...opts,
+    stickyLanProbeTimeoutMs: AUTO_STICKY_LAN_PROBE_TIMEOUT_MS,
+  };
+}
+
 function recordRelayFailure(err, opts = {}) {
   const now = nowMs(opts);
   _relayFailureAtMs = _relayFailureAtMs.filter((at) => now - at <= RELAY_FAILURE_WINDOW_MS);
@@ -554,8 +601,11 @@ async function attemptLanFetch(url, init, opts) {
       ? await Promise.race([fetchPromise, timeoutPromise])
       : await fetchPromise;
     _telemetry.lanOk++;
+    _lastLanOkAtMs = nowMs(opts);
+    _consecutiveLanFailures = 0;
     _lastSuccessfulRoute = "lan";
     _stickyRelayUntilMs = 0;
+    _lastStickyLanProbeAtMs = 0;
     resetRelayFailureCircuit();
     closeRelayClient("lan connected");
     emitRoutingStatus("lan-connected", opts, { url: String(url || "") });
@@ -566,12 +616,17 @@ async function attemptLanFetch(url, init, opts) {
       throw err;
     }
     const lanErr = didTimeout ? new TypeError("LAN fetch timed out") : err;
+    const failedAt = nowMs(opts);
     _telemetry.lanFail++;
-    _telemetry.lastLanFailAt = nowMs(opts);
-    _stickyRelayUntilMs = _telemetry.lastLanFailAt + STICKY_RELAY_MS;
+    _consecutiveLanFailures++;
+    _telemetry.lastLanFailAt = failedAt;
+    _lastStickyLanProbeAtMs = failedAt;
+    _stickyRelayUntilMs = failedAt + stickyRelayWindowAfterLanFailure(failedAt);
     emitRoutingStatus("lan-failed", opts, {
       url: String(url || ""),
       reason: lanErr?.message || String(lanErr),
+      consecutiveLanFailures: _consecutiveLanFailures,
+      stickyRelayMs: Math.max(0, _stickyRelayUntilMs - failedAt),
     });
     return { ok: false, err: lanErr };
   } finally {
@@ -582,8 +637,71 @@ async function attemptLanFetch(url, init, opts) {
   }
 }
 
+function stickyRelayWindowAfterLanFailure(now) {
+  const recentLanOk = _lastLanOkAtMs > 0 && now - _lastLanOkAtMs <= RECENT_LAN_OK_GRACE_MS;
+  if (recentLanOk && _consecutiveLanFailures <= TRANSIENT_LAN_FAILURE_THRESHOLD) {
+    return TRANSIENT_LAN_FAILURE_STICKY_MS;
+  }
+  return STICKY_RELAY_MS;
+}
+
+function shouldDelayRelayAfterRecentLanFailure(now, opts = {}) {
+  if (opts.delayRelayAfterRecentLanFailure === false) {
+    return false;
+  }
+  if (_lastLanOkAtMs <= 0 || now - _lastLanOkAtMs > RECENT_LAN_OK_GRACE_MS) {
+    return false;
+  }
+  return _consecutiveLanFailures > 0 &&
+    _consecutiveLanFailures <= RECENT_LAN_RELAY_SUPPRESSION_FAILURES;
+}
+
+function suppressRelayAfterRecentLanFailure(url, err, opts = {}) {
+  _telemetry.relaySuppressed++;
+  emitRoutingStatus("remote-delayed", opts, {
+    url: String(url || ""),
+    reason: err?.message || String(err || "LAN failure"),
+    consecutiveLanFailures: _consecutiveLanFailures,
+    recentLanOkAtMs: _lastLanOkAtMs,
+  });
+}
+
+function shouldConfirmLanReachability(now, opts = {}) {
+  if (opts.confirmLanReachabilityBeforeRelay === false) {
+    return false;
+  }
+  return _lastLanOkAtMs > 0 && now - _lastLanOkAtMs <= RECENT_LAN_OK_GRACE_MS;
+}
+
+async function confirmLanUnavailableBeforeRelay(url, err, opts = {}) {
+  if (!shouldConfirmLanReachability(nowMs(opts), opts)) {
+    return false;
+  }
+  const path = urlToRelayPath(url);
+  if (path === LAN_REACHABILITY_PROBE_PATH) {
+    return false;
+  }
+
+  const probe = await attemptLanFetch(LAN_REACHABILITY_PROBE_PATH, {
+    cache: "no-store",
+    credentials: "same-origin",
+    headers: { Accept: "application/json" },
+  }, {
+    ...opts,
+    lanTimeoutMs: opts.lanReachabilityProbeTimeoutMs ?? LAN_REACHABILITY_PROBE_TIMEOUT_MS,
+  });
+  if (!probe.ok) {
+    return false;
+  }
+
+  _telemetry.lanReachableAfterFailure++;
+  suppressRelayAfterRecentLanFailure(url, err, opts);
+  return true;
+}
+
 async function attemptStickyLanProbe(url, init, opts) {
   const probeTimeoutMs = opts.stickyLanProbeTimeoutMs ?? DEFAULT_STICKY_LAN_PROBE_TIMEOUT_MS;
+  _lastStickyLanProbeAtMs = nowMs(opts);
   const lan = await attemptLanFetch(url, init, {
     ...opts,
     lanTimeoutMs: probeTimeoutMs,
@@ -859,7 +977,11 @@ function nowMs(opts) {
  *   suppressRoutingStatus?: boolean,
  *   preferRelayError?: boolean,
  *   probeLanWhileSticky?: boolean,
+ *   autoProbeLanWhileSticky?: boolean,
+ *   delayRelayAfterRecentLanFailure?: boolean,
+ *   confirmLanReachabilityBeforeRelay?: boolean,
  *   stickyLanProbeTimeoutMs?: number,
+ *   lanReachabilityProbeTimeoutMs?: number,
  * }} [opts]
  * @returns {Promise<{
  *   ok: boolean,
@@ -875,9 +997,24 @@ export async function routedFetch(url, init = {}, opts = {}) {
 
   // Sticky-relay path: LAN just failed, prefer relay for a while.
   if (_stickyRelayUntilMs > t) {
-    if (opts.probeLanWhileSticky === true) {
-      const lan = await attemptStickyLanProbe(url, init, opts);
+    if (shouldDelayRelayAfterRecentLanFailure(t, opts)) {
+      const lan = await attemptLanFetch(url, init, opts);
+      if (lan.ok) return lan.response;
+      if (shouldDelayRelayAfterRecentLanFailure(nowMs(opts), opts)) {
+        suppressRelayAfterRecentLanFailure(url, lan.err, opts);
+        throw lan.err;
+      }
+      if (await confirmLanUnavailableBeforeRelay(url, lan.err, opts)) {
+        throw lan.err;
+      }
+    }
+    const autoProbe = shouldAutoProbeLanWhileSticky(t, opts);
+    if (opts.probeLanWhileSticky === true || autoProbe) {
+      const lan = await attemptStickyLanProbe(url, init, stickyLanProbeOpts(opts, autoProbe));
       if (lan.ok) return lan.response;
+      if (await confirmLanUnavailableBeforeRelay(url, lan.err, opts)) {
+        throw lan.err;
+      }
     }
     emitRoutingStatus("remote-switching", opts, { url: String(url || ""), sticky: true });
     const r = await attemptRelayFetch(url, init, opts);
@@ -897,6 +1034,13 @@ export async function routedFetch(url, init = {}, opts = {}) {
   // Happy path: LAN first.
   const lan = await attemptLanFetch(url, init, opts);
   if (lan.ok) return lan.response;
+  if (shouldDelayRelayAfterRecentLanFailure(nowMs(opts), opts)) {
+    suppressRelayAfterRecentLanFailure(url, lan.err, opts);
+    throw lan.err;
+  }
+  if (await confirmLanUnavailableBeforeRelay(url, lan.err, opts)) {
+    throw lan.err;
+  }
 
   // Try relay once before giving up.
   emitRoutingStatus("remote-switching", opts, { url: String(url || ""), sticky: false });
@@ -918,6 +1062,9 @@ export function __getTelemetry() {
     ..._telemetry,
     stickyRelayUntilMs: _stickyRelayUntilMs,
     lastRoute: _lastSuccessfulRoute,
+    lastLanOkAtMs: _lastLanOkAtMs,
+    lastStickyLanProbeAtMs: _lastStickyLanProbeAtMs,
+    consecutiveLanFailures: _consecutiveLanFailures,
     hasClient: Boolean(_client),
     clientPairingKey: _clientPairingKey,
     relayCircuitOpenUntilMs: _relayCircuitOpenUntilMs,
@@ -946,6 +1093,9 @@ export function __resetForTest() {
   _telemetry = newTelemetry();
   _lastPairingStateStatus = null;
   _lastSuccessfulRoute = null;
+  _lastLanOkAtMs = 0;
+  _lastStickyLanProbeAtMs = 0;
+  _consecutiveLanFailures = 0;
   _relayFailureAtMs = [];
   _relayCircuitOpenUntilMs = 0;
 }
@@ -953,5 +1103,8 @@ export function __resetForTest() {
 // Test-visible constants for tests that want to assert behavior at the
 // sticky-window boundary without hard-coding 5 minutes in two places.
 export const __STICKY_RELAY_MS = STICKY_RELAY_MS;
+export const __AUTO_STICKY_LAN_PROBE_INTERVAL_MS = AUTO_STICKY_LAN_PROBE_INTERVAL_MS;
+export const __TRANSIENT_LAN_FAILURE_STICKY_MS = TRANSIENT_LAN_FAILURE_STICKY_MS;
 export const __DEFAULT_RELAY_TIMEOUT_MS = DEFAULT_RELAY_TIMEOUT_MS;
 export const __DEFAULT_LAN_TIMEOUT_MS = DEFAULT_LAN_TIMEOUT_MS;
+export const __RECENT_LAN_RELAY_SUPPRESSION_FAILURES = RECENT_LAN_RELAY_SUPPRESSION_FAILURES;