viveworker 0.7.0 → 0.8.1

package/scripts/viveworker-bridge.mjs

@@ -16,11 +16,18 @@ import zlib from "node:zlib";
 import webPush from "web-push";
 import * as hazbaseAuth from "@hazbase/auth";
 import { DEFAULT_LOCALE, SUPPORTED_LOCALES, localeDisplayName, normalizeLocale, resolveLocalePreference, t } from "../web/i18n.js";
+import { APP_BUILD_ID as WEB_APP_BUILD_ID } from "../web/build-id.js";
 import { generatePairingCredentials, shouldRotatePairing, upsertEnvText } from "./lib/pairing.mjs";
 import { renderMarkdownHtml } from "./lib/markdown-render.mjs";
 import { buildAgentCard, handleA2ARequest, resolveA2ATaskDecision, completeA2ATask, failA2ATask } from "./a2a-handler.mjs";
 import { registerWithRelay, startRelayPolling, stopRelayPolling, postRelayResult, getRelayStatus, updatePublicTasksFlag } from "./a2a-relay-client.mjs";
 import { createMoltbookClient, readScoutState, writeScoutState, rollScoutDayIfNeeded, markPostSeen, recordComposeAttempt, writeDraft, readDraft, deleteDraft, listPendingDrafts, solveVerificationPuzzle, solvePuzzleWithLLM, recordPuzzleAttempt, listInboxItems } from "./moltbook-api.mjs";
+import { startRemotePairingRelay, DEFAULT_RELAY_URL } from "./lib/remote-pairing/orchestrator.mjs";
+import { restartRemotePairingRelay, persistRemotePairingEnv, getRemotePairingStatus } from "./lib/remote-pairing/control.mjs";
+import { appendRemotePairingAuditEvent, readRemotePairingAuditEvents } from "./lib/remote-pairing/audit.mjs";
+import { loadPairings, removePairingPersisted, addPairingPersisted, rotateRelayTokenPersisted, buildPairing, REMOTE_PAIRINGS_FILE } from "./lib/remote-pairing/pairings.mjs";
+import { ensureIdentityKeypair } from "./lib/remote-pairing/keys.mjs";
+import { fingerprintIdentity, bytesToHex } from "./lib/remote-pairing/keys-core.mjs";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -42,6 +49,8 @@ const listSupportedPayments = typeof hazbaseAuth.listSupportedPayments === "func
   ? hazbaseAuth.listSupportedPayments.bind(hazbaseAuth)
   : async () => ({ networks: [], defaultNetwork: "base-sepolia" });
 const appPackageVersion = readPackageVersion();
+const WEB_APP_SCRIPT_URL = `/app.js?v=${WEB_APP_BUILD_ID}`;
+const WEB_APP_BUILD_ID_PLACEHOLDER = "__VIVEWORKER_APP_BUILD_ID__";
 const sessionCookieName = "viveworker_session";
 const deviceCookieName = "viveworker_device";
 const historyKinds = new Set(["completion", "assistant_final", "plan_ready", "approval", "plan", "choice", "info", "moltbook_reply", "moltbook_draft", "thread_share", "a2a_task", "a2a_task_result"]);
@@ -52,6 +61,7 @@ const DEFAULT_DEVICE_TRUST_TTL_MS = 30 * 24 * 60 * 60 * 1000;
 const MAX_PAIRED_DEVICES = 200;
 const PAIRING_RATE_LIMIT_WINDOW_MS = 15 * 60 * 1000;
 const PAIRING_RATE_LIMIT_MAX_ATTEMPTS = 8;
+const REMOTE_PAIRING_RELAY_TOKEN_ROTATION_MS = 30 * 24 * 60 * 60 * 1000;
 const DEFAULT_COMPLETION_REPLY_IMAGE_MAX_BYTES = 15 * 1024 * 1024;
 const DEFAULT_COMPLETION_REPLY_UPLOAD_TTL_MS = 24 * 60 * 60 * 1000;
 const MAX_COMPLETION_REPLY_IMAGE_COUNT = 4;
@@ -209,6 +219,7 @@ const cli = parseCliArgs(process.argv.slice(2));
 const envFile = resolveEnvFile(cli.envFile);
 loadEnvFile(envFile);
 loadEnvFile(path.join(os.homedir(), ".viveworker", "a2a.env"));
+loadEnvFile(path.join(os.homedir(), ".viveworker", "remote-pairing.env"));
 await maybeRotateStartupPairingEnv(envFile);
 
 const config = buildConfig(cli);
@@ -261,6 +272,7 @@ const runtime = {
   recentCodeEvents: [],
   pairingAttemptsByRemoteAddress: new Map(),
   ipcClient: null,
+  remotePairingHandle: null,
   stopping: false,
   // In-memory cache for the `/api/share/status` endpoint. A 30s TTL avoids
   // hammering the share worker on every settings-page render. Purely runtime —
@@ -475,6 +487,11 @@ function buildSessionLocalePayload(config, state, deviceId) {
     a2aShareEnabled: Boolean(config.a2aRelayUserId && config.a2aApiKey),
     a2aExecutors: runtime.a2aAvailableExecutors || { codex: false, claude: false },
     a2aExecutorPreference: state.a2aExecutorPreference || "ask",
+    // Remote pairing is always "available" — the row appears in Settings →
+    // Integrations regardless of whether the relay is currently enabled, so
+    // users can find the toggle. The actual enabled/connected state is read
+    // from /api/remote-pairing/status.
+    remotePairingAvailable: true,
   };
 }
 
@@ -808,6 +825,21 @@ function normalizeTimelineFileRefs(rawFileRefs) {
   return deduped;
 }
 
+function filterTimelineFileRefsForImagePaths(fileRefs, imagePaths) {
+  const normalizedRefs = normalizeTimelineFileRefs(fileRefs);
+  const normalizedImages = normalizeTimelineImagePaths(imagePaths);
+  if (normalizedRefs.length === 0 || normalizedImages.length === 0) {
+    return normalizedRefs;
+  }
+
+  const imageRefKeys = new Set();
+  for (const imagePath of normalizedImages) {
+    imageRefKeys.add(imagePath);
+    imageRefKeys.add(path.basename(imagePath));
+  }
+  return normalizedRefs.filter((fileRef) => !imageRefKeys.has(fileRef) && !imageRefKeys.has(path.basename(fileRef)));
+}
+
 function cleanTimelineFileRef(value) {
   let normalized = cleanText(value || "");
   if (!normalized) {
@@ -2808,6 +2840,7 @@ function normalizeProvider(value) {
   if (normalized === "moltbook") return "moltbook";
   if (normalized === "a2a") return "a2a";
   if (normalized === "viveworker") return "viveworker";
+  if (normalized === "mcp") return "mcp";
   return "codex";
 }
 
@@ -2817,6 +2850,7 @@ function providerDisplayName(locale, provider) {
   if (p === "moltbook") return "Moltbook";
   if (p === "a2a") return "A2A";
   if (p === "viveworker") return t(locale, "common.appName");
+  if (p === "mcp") return "MCP";
   return t(locale, "common.codex");
 }
 
@@ -2865,7 +2899,7 @@ function normalizeHistoryItem(raw) {
   const threadId = cleanText(raw.threadId ?? extractConversationIdFromStableId(stableId) ?? "");
   const rawThreadLabel = cleanText(raw.threadLabel ?? "");
   const historyProvider = normalizeProvider(raw.provider);
-  const skipHistoryThreadLabelRewrite = historyProvider === "moltbook" || historyProvider === "a2a" || historyProvider === "viveworker"
+  const skipHistoryThreadLabelRewrite = historyProvider === "moltbook" || historyProvider === "a2a" || historyProvider === "viveworker" || historyProvider === "mcp"
     || kind === "moltbook_reply" || kind === "moltbook_draft" || kind === "a2a_task" || kind === "a2a_task_result" || kind === "thread_share";
   const threadLabel = skipHistoryThreadLabelRewrite
     ? rawThreadLabel
@@ -2874,7 +2908,8 @@ function normalizeHistoryItem(raw) {
   const title =
     (!isFallbackTimelineTitle(rawTitle, kind, threadId) ? rawTitle : "") ||
     (threadLabel ? formatTitle(kindTitle(DEFAULT_LOCALE, kind), threadLabel) : kindTitle(DEFAULT_LOCALE, kind));
-  const messageText = normalizeTimelineMessageText(raw.messageText ?? "");
+  const rawMessageText = raw.messageText ?? "";
+  const messageText = normalizeTimelineMessageText(rawMessageText);
   const summary = normalizeNotificationText(raw.summary ?? "") || formatNotificationBody(messageText, 100) || "";
   const createdAtMs = Number(raw.createdAtMs) || Date.now();
   if (!stableId || !historyKinds.has(kind) || !title) {
@@ -2882,6 +2917,14 @@ function normalizeHistoryItem(raw) {
   }
 
   const outcome = normalizeTimelineOutcome(raw.outcome ?? "") || inferTimelineOutcome(kind, summary, messageText);
+  const imagePaths = normalizeTimelineImagePaths([
+    ...(Array.isArray(raw.imagePaths ?? raw.localImagePaths) ? (raw.imagePaths ?? raw.localImagePaths) : []),
+    ...extractTimelineImagePaths(rawMessageText),
+  ]);
+  const fileRefs = filterTimelineFileRefsForImagePaths(
+    normalizeTimelineFileRefs(raw.fileRefs ?? extractTimelineFileRefs(messageText)),
+    imagePaths
+  );
 
   const normalized = {
     stableId,
@@ -2892,8 +2935,8 @@ function normalizeHistoryItem(raw) {
     threadLabel,
     summary,
     messageText,
-    imagePaths: normalizeTimelineImagePaths(raw.imagePaths ?? raw.localImagePaths ?? []),
-    fileRefs: normalizeTimelineFileRefs(raw.fileRefs ?? extractTimelineFileRefs(messageText)),
+    imagePaths,
+    fileRefs,
     diffText: normalizeTimelineDiffText(raw.diffText ?? ""),
     diffSource: normalizeTimelineDiffSource(raw.diffSource ?? ""),
     diffAvailable: raw.diffAvailable === true || Boolean(raw.diffText),
@@ -3127,7 +3170,8 @@ function normalizeTimelineEntry(raw) {
   }
 
   const threadId = cleanText(raw.threadId ?? extractConversationIdFromStableId(stableId) ?? "");
-  const messageText = normalizeTimelineMessageText(raw.messageText ?? "");
+  const rawMessageText = raw.messageText ?? "";
+  const messageText = normalizeTimelineMessageText(rawMessageText);
   const fileEventType = normalizeTimelineFileEventType(raw.fileEventType ?? "");
   const diffText = normalizeTimelineDiffText(raw.diffText ?? "");
   const diffSource = normalizeTimelineDiffSource(raw.diffSource ?? "");
@@ -3142,7 +3186,7 @@ function normalizeTimelineEntry(raw) {
     (kind === "file_event" ? "" : cleanText(raw.title ?? "")) ||
     "";
   const rawProvider = normalizeProvider(raw.provider);
-  const skipThreadLabelRewrite = rawProvider === "moltbook" || rawProvider === "a2a" || rawProvider === "viveworker"
+  const skipThreadLabelRewrite = rawProvider === "moltbook" || rawProvider === "a2a" || rawProvider === "viveworker" || rawProvider === "mcp"
     || kind === "moltbook_reply" || kind === "moltbook_draft" || kind === "a2a_task" || kind === "a2a_task_result" || kind === "thread_share";
   const threadLabel =
     skipThreadLabelRewrite
@@ -3162,6 +3206,14 @@ function normalizeTimelineEntry(raw) {
     threadLabel ||
     kindTitle(DEFAULT_LOCALE, kind);
   const outcome = normalizeTimelineOutcome(raw.outcome ?? "") || inferTimelineOutcome(kind, summary, messageText);
+  const imagePaths = normalizeTimelineImagePaths([
+    ...(Array.isArray(raw.imagePaths ?? raw.localImagePaths) ? (raw.imagePaths ?? raw.localImagePaths) : []),
+    ...extractTimelineImagePaths(rawMessageText),
+  ]);
+  const fileRefs = filterTimelineFileRefsForImagePaths(
+    normalizeTimelineFileRefs(raw.fileRefs ?? extractTimelineFileRefs(messageText)),
+    imagePaths
+  );
 
   const normalized = {
     stableId,
@@ -3174,8 +3226,8 @@ function normalizeTimelineEntry(raw) {
     messageText,
     fileEventType,
     previousFileRefs: normalizeTimelineFileRefs(raw.previousFileRefs ?? []),
-    imagePaths: normalizeTimelineImagePaths(raw.imagePaths ?? raw.localImagePaths ?? []),
-    fileRefs: normalizeTimelineFileRefs(raw.fileRefs ?? extractTimelineFileRefs(messageText)),
+    imagePaths,
+    fileRefs,
     diffText,
     diffSource,
     diffAvailable: raw.diffAvailable === true || Boolean(diffText),
@@ -4305,7 +4357,10 @@ async function processClaudeTranscriptFile({ filePath, config, runtime, state, n
         if (block?.type === "text" && block.text) text += block.text;
       }
     }
-    text = cleanText(text);
+    // Preserve paragraph structure for the renderer — `cleanText` collapses
+    // every \s+ (newlines included) into a single space, which would flatten
+    // markdown tables / code fences / lists into a single illegible line.
+    text = normalizeLongText(text);
     if (!text) continue;
     if (type === "user" && record.entrypoint === "sdk-cli") {
       const derivedThreadLabel = deriveClaudeSdkCliThreadLabel(text, threadId);
@@ -5181,8 +5236,8 @@ async function readRecentRolloutUserMessagesWithImages({ filePath, maxBytes }) {
 async function querySqliteTimelineRows({ logsDbFile, cursorId, minTsSec = 0 }) {
   const conditions = [
     `id > ${Math.max(0, Number(cursorId) || 0)}`,
-    `target = 'codex_api::endpoint::responses_websocket'`,
-    `feedback_log_body LIKE '%websocket event: {"type":"response.output_item.done"%'`,
+    `target IN ('codex_api::endpoint::responses_websocket', 'codex_api::sse::responses')`,
+    `(feedback_log_body LIKE '%websocket event: {"type":"response.output_item.done"%' OR feedback_log_body LIKE '%SSE event: {"type":"response.output_item.done"%')`,
     `feedback_log_body LIKE '%"type":"message"%'`,
     `feedback_log_body LIKE '%"role":"assistant"%'`,
   ];
@@ -5192,28 +5247,50 @@ async function querySqliteTimelineRows({ logsDbFile, cursorId, minTsSec = 0 }) {
   }
 
   const sql = `
-    SELECT id, ts, thread_id, feedback_log_body
+    SELECT
+      logs.id,
+      logs.ts,
+      logs.thread_id,
+      logs.feedback_log_body,
+      (
+        SELECT ctx.feedback_log_body
+        FROM logs AS ctx
+        WHERE ctx.id < logs.id
+          AND ctx.id >= logs.id - 5
+          AND ctx.target = 'codex_otel.log_only'
+          AND ctx.feedback_log_body LIKE '%conversation.id=%'
+        ORDER BY ctx.id DESC
+        LIMIT 1
+      ) AS context_log_body
     FROM logs
     WHERE ${conditions.join("\n      AND ")}
-    ORDER BY id ASC
+    ORDER BY logs.id ASC
     LIMIT ${SQLITE_COMPLETION_BATCH_SIZE}
   `;
 
   return runSqliteJsonQuery(logsDbFile, sql);
 }
 
-function buildSqliteTimelineEntry({ row, config, runtime }) {
-  const body = String(row?.feedback_log_body ?? "");
-  const marker = "websocket event: ";
-  const markerIndex = body.indexOf(marker);
-  if (markerIndex === -1) {
-    return null;
+function parseResponsesEventPayload(body) {
+  const raw = String(body || "");
+  for (const marker of ["websocket event: ", "SSE event: "]) {
+    const markerIndex = raw.indexOf(marker);
+    if (markerIndex === -1) {
+      continue;
+    }
+    try {
+      return JSON.parse(raw.slice(markerIndex + marker.length));
+    } catch {
+      return null;
+    }
   }
+  return null;
+}
 
-  let payload;
-  try {
-    payload = JSON.parse(body.slice(markerIndex + marker.length));
-  } catch {
+function buildSqliteTimelineEntry({ row, config, runtime }) {
+  const body = String(row?.feedback_log_body ?? "");
+  const payload = parseResponsesEventPayload(body);
+  if (!payload) {
     return null;
   }
 
@@ -5237,7 +5314,12 @@ function buildSqliteTimelineEntry({ row, config, runtime }) {
     return null;
   }
 
-  const threadId = cleanText(row.thread_id || extractThreadIdFromLogBody(body));
+  const contextLogBody = String(row?.context_log_body ?? "");
+  const threadId = cleanText(
+    row.thread_id ||
+    extractThreadIdFromLogBody(body) ||
+    extractThreadIdFromLogBody(contextLogBody)
+  );
   if (!threadId) {
     return null;
   }
@@ -5365,6 +5447,25 @@ async function findReplyUploadFallback(config, sourcePath, usedPaths = new Set()
   return candidates[0]?.filePath || "";
 }
 
+function isFileAccessDeniedError(error) {
+  const code = cleanText(error?.code || "");
+  return code === "EACCES" || code === "EPERM";
+}
+
+async function copyFileWithSystemCp(sourcePath, destinationPath) {
+  return new Promise((resolve, reject) => {
+    const child = spawn("/bin/cp", ["-p", sourcePath, destinationPath], { stdio: "ignore" });
+    child.once("error", reject);
+    child.once("exit", (code, signal) => {
+      if (code === 0) {
+        resolve(true);
+        return;
+      }
+      reject(new Error(`cp exited with ${signal || code}`));
+    });
+  });
+}
+
 async function copyTimelineAttachmentToPersistentDir(config, sourcePath) {
   const normalizedSourcePath = resolvePath(cleanText(sourcePath || ""));
   if (!normalizedSourcePath) {
@@ -5381,6 +5482,16 @@ async function copyTimelineAttachmentToPersistentDir(config, sourcePath) {
     await fs.copyFile(normalizedSourcePath, destinationPath);
     return destinationPath;
   } catch (error) {
+    if (isFileAccessDeniedError(error)) {
+      try {
+        await copyFileWithSystemCp(normalizedSourcePath, destinationPath);
+        return destinationPath;
+      } catch (fallbackError) {
+        await fs.rm(destinationPath, { force: true }).catch(() => {});
+        console.warn(`[timeline-image-copy-skipped] ${error?.message || error}; cp fallback failed: ${fallbackError?.message || fallbackError}`);
+        return "";
+      }
+    }
     console.warn(`[timeline-image-copy-skipped] ${error?.message || error}`);
     return "";
   }
@@ -5393,8 +5504,12 @@ async function normalizePersistedTimelineImagePaths({ config, state, imagePaths
   }
 
   const aliases = isPlainObject(state.timelineImagePathAliases) ? state.timelineImagePathAliases : (state.timelineImagePathAliases = {});
+  const copyFailures = isPlainObject(state.timelineImagePathCopyFailures)
+    ? state.timelineImagePathCopyFailures
+    : (state.timelineImagePathCopyFailures = {});
   const usedFallbacks = new Set();
   const nextPaths = [];
+  const copyRetryMs = 10 * 60 * 1000;
 
   for (const rawPath of normalizedImagePaths) {
     const normalizedPath = cleanText(rawPath || "");
@@ -5404,24 +5519,38 @@ async function normalizePersistedTimelineImagePaths({ config, state, imagePaths
 
     const aliasedPath = cleanText(aliases[normalizedPath] || "");
     if (aliasedPath) {
-      try {
-        await fs.access(aliasedPath);
-        nextPaths.push(aliasedPath);
-        continue;
-      } catch {
-        // Fall through and repair below.
+      if (aliasedPath.startsWith(`${config.timelineAttachmentsDir}${path.sep}`)) {
+        try {
+          await fs.access(aliasedPath);
+          nextPaths.push(aliasedPath);
+          continue;
+        } catch {
+          // Fall through and repair below.
+        }
       }
     }
 
+    const lastCopyFailureMs = Math.max(0, Number(copyFailures[normalizedPath]) || 0);
+    if (
+      lastCopyFailureMs > 0 &&
+      Date.now() - lastCopyFailureMs < copyRetryMs &&
+      !normalizedPath.startsWith(`${config.timelineAttachmentsDir}${path.sep}`)
+    ) {
+      nextPaths.push(normalizedPath);
+      continue;
+    }
+
     let existingSourcePath = normalizedPath;
     try {
       await fs.access(existingSourcePath);
-    } catch {
-      existingSourcePath = await findReplyUploadFallback(config, normalizedPath, usedFallbacks);
-      if (!existingSourcePath) {
-        continue;
+    } catch (error) {
+      if (!isFileAccessDeniedError(error)) {
+        existingSourcePath = await findReplyUploadFallback(config, normalizedPath, usedFallbacks);
+        if (!existingSourcePath) {
+          continue;
+        }
+        usedFallbacks.add(existingSourcePath);
       }
-      usedFallbacks.add(existingSourcePath);
     }
 
     let persistentPath = existingSourcePath;
@@ -5429,6 +5558,11 @@ async function normalizePersistedTimelineImagePaths({ config, state, imagePaths
       persistentPath = await copyTimelineAttachmentToPersistentDir(config, existingSourcePath) || existingSourcePath;
     }
 
+    if (persistentPath === existingSourcePath && !existingSourcePath.startsWith(`${config.timelineAttachmentsDir}${path.sep}`)) {
+      copyFailures[normalizedPath] = Date.now();
+    } else {
+      delete copyFailures[normalizedPath];
+    }
     aliases[normalizedPath] = persistentPath;
     nextPaths.push(persistentPath);
   }
@@ -5775,8 +5909,8 @@ async function processScannedEvent({ config, runtime, state, event }) {
 async function querySqliteCompletionRows({ logsDbFile, cursorId, minTsSec = 0 }) {
   const conditions = [
     `id > ${Math.max(0, Number(cursorId) || 0)}`,
-    `target = 'codex_api::endpoint::responses_websocket'`,
-    `feedback_log_body LIKE '%websocket event: {"type":"response.output_item.done"%'`,
+    `target IN ('codex_api::endpoint::responses_websocket', 'codex_api::sse::responses')`,
+    `(feedback_log_body LIKE '%websocket event: {"type":"response.output_item.done"%' OR feedback_log_body LIKE '%SSE event: {"type":"response.output_item.done"%')`,
     `feedback_log_body LIKE '%"type":"message"%'`,
     `feedback_log_body LIKE '%"role":"assistant"%'`,
     `feedback_log_body LIKE '%"phase":"final_answer"%'`,
@@ -5787,10 +5921,24 @@ async function querySqliteCompletionRows({ logsDbFile, cursorId, minTsSec = 0 })
   }
 
   const sql = `
-    SELECT id, ts, thread_id, feedback_log_body
+    SELECT
+      logs.id,
+      logs.ts,
+      logs.thread_id,
+      logs.feedback_log_body,
+      (
+        SELECT ctx.feedback_log_body
+        FROM logs AS ctx
+        WHERE ctx.id < logs.id
+          AND ctx.id >= logs.id - 5
+          AND ctx.target = 'codex_otel.log_only'
+          AND ctx.feedback_log_body LIKE '%conversation.id=%'
+        ORDER BY ctx.id DESC
+        LIMIT 1
+      ) AS context_log_body
     FROM logs
     WHERE ${conditions.join("\n      AND ")}
-    ORDER BY id ASC
+    ORDER BY logs.id ASC
     LIMIT ${SQLITE_COMPLETION_BATCH_SIZE}
   `;
 
@@ -5836,16 +5984,8 @@ async function runSqliteJsonQuery(dbFile, sql) {
 
 function buildSqliteCompletionEvent({ row, config, runtime }) {
   const body = String(row?.feedback_log_body ?? "");
-  const marker = "websocket event: ";
-  const markerIndex = body.indexOf(marker);
-  if (markerIndex === -1) {
-    return null;
-  }
-
-  let payload;
-  try {
-    payload = JSON.parse(body.slice(markerIndex + marker.length));
-  } catch {
+  const payload = parseResponsesEventPayload(body);
+  if (!payload) {
     return null;
   }
 
@@ -5858,7 +5998,12 @@ function buildSqliteCompletionEvent({ row, config, runtime }) {
     return null;
   }
 
-  const threadId = cleanText(row.thread_id || extractThreadIdFromLogBody(body));
+  const contextLogBody = String(row?.context_log_body ?? "");
+  const threadId = cleanText(
+    row.thread_id ||
+    extractThreadIdFromLogBody(body) ||
+    extractThreadIdFromLogBody(contextLogBody)
+  );
   const turnId = cleanText(extractTurnIdFromLogBody(body) || item.id || row.id);
   if (!threadId || !turnId) {
     return null;
@@ -8251,6 +8396,12 @@ function normalizeIpcErrorMessage(errorValue) {
   return cleanText(String(errorValue ?? "")) || "ipc-request-failed";
 }
 
+function isStartTurnAckTimeout(errorValue) {
+  const message = normalizeIpcErrorMessage(errorValue);
+  return message === "thread-follower-start-turn-timeout" ||
+    message === "turn/start-timeout";
+}
+
 function buildDefaultCollaborationMode(threadState) {
   // Fallback turns must leave Plan mode unless the caller explicitly opts in.
   return buildRequestedCollaborationMode(threadState, "default");
@@ -8942,6 +9093,14 @@ function deriveClaudeSdkCliThreadLabel(messageText, conversationId = "") {
   if (/^You are scoring Moltbook posts? for an AI agent\b/iu.test(single)) {
     return "Moltbook scoring";
   }
+  if (/^You are drafting a reply on behalf of the agent described below\b/iu.test(single) ||
+      /\bYou are replying to the following post on Moltbook\b/iu.test(single)) {
+    return "Moltbook reply drafting";
+  }
+  if (/^You are composing an original post on Moltbook\b/iu.test(single) ||
+      /\bAvailable submolts:\s*general,\s*builds,\s*tooling,\s*agents,\s*infrastructure\b.*\bSUBMOLT:\s*.*\bTITLE:\s*.*\bINTENT:\s*/iu.test(single)) {
+    return "Moltbook post drafting";
+  }
   if (/^Codex from another agent:/iu.test(single)) {
     return truncate(cleanText(single.replace(/^Codex from another agent:\s*/iu, "")), 90) || "Cross-agent task";
   }
@@ -8962,6 +9121,46 @@ function isHiddenClaudeInternalScoringText(text) {
   return /^You are scoring Moltbook posts? for an AI agent\b/iu.test(single);
 }
 
+function isMoltbookHarnessThreadLabel(text) {
+  const single = cleanText(stripNotificationMarkup(stripEnvironmentContextBlocks(text || "")));
+  if (!single) {
+    return false;
+  }
+  return (
+    single === "Moltbook reply drafting" ||
+    single === "Moltbook post drafting" ||
+    /^You are drafting a reply on behalf of the agent described below\b/iu.test(single) ||
+    /^You are composing an original post on Moltbook\b/iu.test(single) ||
+    /\bYou are replying to the following post on Moltbook\b/iu.test(single) ||
+    /\bAvailable submolts:\s*general,\s*builds,\s*tooling,\s*agents,\s*infrastructure\b.*\bSUBMOLT:\s*.*\bTITLE:\s*.*\bINTENT:\s*/iu.test(single)
+  );
+}
+
+function isHiddenMoltbookHarnessPromptText(text) {
+  const single = cleanText(stripNotificationMarkup(stripEnvironmentContextBlocks(text || "")));
+  if (!single) {
+    return false;
+  }
+  return (
+    /^You are drafting a reply on behalf of the agent described below\b/iu.test(single) ||
+    /^You are composing an original post on Moltbook\b/iu.test(single) ||
+    /\bYou are replying to the following post on Moltbook\b/iu.test(single) ||
+    /\bAvailable submolts:\s*general,\s*builds,\s*tooling,\s*agents,\s*infrastructure\b.*\bSUBMOLT:\s*.*\bTITLE:\s*.*\bINTENT:\s*/iu.test(single)
+  );
+}
+
+function isHiddenMoltbookHarnessOutputText(text) {
+  const single = cleanText(stripNotificationMarkup(stripEnvironmentContextBlocks(text || "")));
+  if (!single) {
+    return false;
+  }
+  return (
+    /^INTENT:\s+.+\s+---\s+.+/isu.test(single) ||
+    /^SUBMOLT:\s+.+\s+TITLE:\s+.+\s+INTENT:\s+.+\s+---\s+.+/isu.test(single) ||
+    single === "NO_MATCH"
+  );
+}
+
 function isHiddenCodexApprovalAssessmentText(text) {
   const single = cleanText(stripNotificationMarkup(stripEnvironmentContextBlocks(text || "")));
   if (!single) {
@@ -8971,7 +9170,7 @@ function isHiddenCodexApprovalAssessmentText(text) {
 }
 
 function shouldHideInternalTimelineItem(item) {
-  return shouldHideClaudeInternalItem(item) || shouldHideCodexInternalApprovalItem(item);
+  return shouldHideClaudeInternalItem(item) || shouldHideCodexInternalApprovalItem(item) || shouldHideMoltbookHarnessItem(item);
 }
 
 function shouldHideClaudeInternalItem(item) {
@@ -8993,6 +9192,29 @@ function shouldHideClaudeInternalItem(item) {
   );
 }
 
+function shouldHideMoltbookHarnessItem(item) {
+  if (!isPlainObject(item)) {
+    return false;
+  }
+  const provider = normalizeProvider(item.provider);
+  if (provider !== "claude" && provider !== "codex") {
+    return false;
+  }
+
+  return (
+    isMoltbookHarnessThreadLabel(item.threadLabel) ||
+    isMoltbookHarnessThreadLabel(item.title) ||
+    isHiddenMoltbookHarnessPromptText(item.messageText) ||
+    isHiddenMoltbookHarnessPromptText(item.summary) ||
+    isHiddenMoltbookHarnessPromptText(item.detailText) ||
+    isHiddenMoltbookHarnessPromptText(item.message) ||
+    isHiddenMoltbookHarnessOutputText(item.messageText) ||
+    isHiddenMoltbookHarnessOutputText(item.summary) ||
+    isHiddenMoltbookHarnessOutputText(item.detailText) ||
+    isHiddenMoltbookHarnessOutputText(item.message)
+  );
+}
+
 function shouldSuppressInternalScannedEvent(event) {
   if (!isPlainObject(event)) {
     return false;
@@ -9811,6 +10033,16 @@ function base64UrlDecode(value) {
   return Buffer.from(String(value), "base64url").toString("utf8");
 }
 
+function constantTimeStringEqual(a, b) {
+  // Pad-then-compare so the timing leak is bounded by the longer string's
+  // length rather than the matching prefix. Caller still gets a clean
+  // boolean — no behavioural difference from `===`.
+  const left = Buffer.from(String(a ?? ""), "utf8");
+  const right = Buffer.from(String(b ?? ""), "utf8");
+  if (left.length !== right.length) return false;
+  return crypto.timingSafeEqual(left, right);
+}
+
 function signSessionPayload(payload, secret) {
   const encoded = base64UrlEncode(JSON.stringify(payload));
   const signature = crypto.createHmac("sha256", secret).update(encoded).digest("base64url");
@@ -10137,6 +10369,35 @@ function buildDeviceSummary({ config, state, deviceId, record, currentDeviceId,
   };
 }
 
+function inferLegacyRelayDeviceId(state, config, pairing) {
+  const active = activeTrustedDevices(state, config);
+  if (active.length === 1) {
+    return active[0].deviceId;
+  }
+
+  const addedAtMs = Number(pairing?.addedAtMs) || 0;
+  if (addedAtMs <= 0) {
+    return "";
+  }
+  const nearby = active.filter(({ record }) => {
+    const pairedAtMs = Number(record?.pairedAtMs) || 0;
+    return pairedAtMs > 0 && Math.abs(pairedAtMs - addedAtMs) <= 10 * 60 * 1000;
+  });
+  return nearby.length === 1 ? nearby[0].deviceId : "";
+}
+
+function resolveRelaySessionDeviceId(state, config, pairing, fallbackDeviceId) {
+  const explicit = cleanText(pairing?.deviceId || "");
+  if (explicit) {
+    return explicit;
+  }
+  const inferred = inferLegacyRelayDeviceId(state, config, pairing);
+  if (inferred) {
+    return inferred;
+  }
+  return cleanText(pairing?.phoneFingerprint || "") || cleanText(fallbackDeviceId || "") || null;
+}
+
 // Shared between `/api/session` and `/api/bootstrap` so both return an
 // identical session shape.
 function buildSessionPayload({ config, state, session }) {
@@ -10147,6 +10408,7 @@ function buildSessionPayload({ config, state, session }) {
     webPushEnabled: config.webPushEnabled,
     httpsEnabled: config.nativeApprovalPublicBaseUrl.startsWith("https://"),
     appVersion: appPackageVersion,
+    webAppBuildId: WEB_APP_BUILD_ID,
     deviceId: session.deviceId || null,
     temporaryPairing: session.temporaryPairing === true,
     ...buildSessionLocalePayload(config, state, session.deviceId),
@@ -10180,6 +10442,38 @@ function readSession(req, config, state) {
     };
   }
 
+  // Relay-dispatched requests authenticate via the Noise channel
+  // binding + pairing identity, set on the synthetic IncomingMessage by
+  // scripts/lib/remote-pairing/http-dispatch.mjs. They have no cookies
+  // (HttpOnly session cookie can't be forwarded by the PWA's JS layer,
+  // and the RPC frame doesn't carry browser cookies), so the cookie
+  // path below would always 401 them.
+  //
+  // Trust model: only this process's relay orchestrator can attach this
+  // marker — it's set on a synthetic req object that never leaves the
+  // bridge. An attacker would need code-exec inside the bridge to forge
+  // it, which is past the threat model anyway. The orchestrator only
+  // dispatches requests for pairings whose Noise IK handshake succeeded
+  // against the bridge's static key, so reaching this branch implies
+  // the phone proved possession of `pairing.phonePub`.
+  const relay = req.viveworker;
+  if (relay?.fromRelay && relay.pairing?.pairingId) {
+    const relayDeviceId = resolveRelaySessionDeviceId(state, config, relay.pairing, deviceId);
+    return {
+      authenticated: true,
+      sessionId: `relay:${relay.pairing.pairingId}`,
+      pairedAtMs: Number(relay.pairing.addedAtMs) || Date.now(),
+      // Relay sessions live only as long as the underlying Noise channel
+      // — there's no cookie expiry to track. 0 = "no fixed expiry, the
+      // transport layer manages liveness".
+      expiresAtMs: 0,
+      deviceId: relayDeviceId,
+      fromRelay: true,
+      pairingId: relay.pairing.pairingId,
+      relayPhoneFingerprint: relay.pairing.phoneFingerprint || "",
+    };
+  }
+
   const token = parseCookies(req)[sessionCookieName];
   const payload = token ? verifySessionToken(token, config.sessionSecret) : null;
   if (!payload) {
@@ -10356,6 +10650,273 @@ function buildPushStatusResponse(config, state, session) {
   };
 }
 
+async function buildMcpStatusResponse(config, runtime, state) {
+  const remote = getRemotePairingStatus(runtime);
+  let remotePairings = 0;
+  try {
+    remotePairings = (await loadPairings()).length;
+  } catch {
+    remotePairings = 0;
+  }
+  const now = Date.now();
+  const pairedDevices = isPlainObject(state.pairedDevices) ? state.pairedDevices : {};
+  const trustedDevices = Object.values(pairedDevices).filter((raw) => {
+    const record = normalizeDeviceTrustRecord(raw, { trustTtlMs: config.deviceTrustTtlMs, now });
+    return record && !record.revokedAtMs && Number(record.trustedUntilMs) > now;
+  }).length;
+  const a2aRelay = getRelayStatus();
+  return {
+    ok: true,
+    bridge: {
+      running: true,
+      publicBaseUrl: config.nativeApprovalPublicBaseUrl,
+      locale: config.defaultLocale,
+      codexConnected: Boolean(runtime.ipcClient?.clientId),
+    },
+    pairing: {
+      trustedDevices,
+      webPushEnabled: Boolean(config.webPushEnabled),
+      pushSubscriptions: listPushSubscriptions(state).length,
+    },
+    remote: {
+      enabled: Boolean(remote.enabled),
+      relayUrl: remote.relayUrl || config.remotePairingRelayUrl || "",
+      identityFingerprint: remote.identityFingerprint || null,
+      pairings: remotePairings,
+      sessions: Array.isArray(remote.sessions)
+        ? remote.sessions.map((session) => ({
+            state: cleanText(session?.state || ""),
+            lastRoute: cleanText(session?.lastRoute || ""),
+            connected: cleanText(session?.state || "") === "connected",
+            phoneFingerprint: cleanText(session?.phoneFingerprint || ""),
+            lastSeenAtMs: Number(session?.lastSeenAtMs) || 0,
+          }))
+        : [],
+    },
+    a2a: {
+      enabled: Boolean(config.a2aApiKey),
+      relayEnabled: Boolean(config.a2aRelayUrl && config.a2aRelayUserId),
+      relayConnected: Boolean(a2aRelay.polling && a2aRelay.lastPollOk),
+      userIdConfigured: Boolean(config.a2aRelayUserId),
+    },
+    share: {
+      enabled: Boolean(config.a2aRelayUserId && config.a2aApiKey),
+      shareUrl: config.a2aShareUrl || "",
+    },
+    moltbook: {
+      enabled: Boolean(config.moltbookApiKey),
+    },
+  };
+}
+
+function mcpTimeoutMs(value) {
+  const n = Number(value);
+  if (!Number.isFinite(n)) return 600_000;
+  return Math.max(10_000, Math.min(900_000, Math.floor(n)));
+}
+
+function mcpText(value, maxChars = 50_000) {
+  const text = String(value ?? "");
+  return text.length > maxChars ? `${text.slice(0, maxChars)}\n\n[truncated by viveworker MCP]` : text;
+}
+
+function normalizeMcpStringArray(value, maxItems = 20) {
+  if (!Array.isArray(value)) return [];
+  return value
+    .map((item) => cleanText(item ?? ""))
+    .filter(Boolean)
+    .slice(0, maxItems);
+}
+
+function normalizeMcpQuestionOptions(value) {
+  if (!Array.isArray(value)) return [];
+  return value
+    .map((option, index) => {
+      if (typeof option === "string") {
+        const label = cleanText(option);
+        return label ? { label } : null;
+      }
+      if (!isPlainObject(option)) return null;
+      const label = cleanText(option.label ?? option.title ?? `Option ${index + 1}`);
+      if (!label) return null;
+      const description = cleanText(option.description ?? option.detail ?? "");
+      return { label, ...(description ? { description } : {}) };
+    })
+    .filter(Boolean)
+    .slice(0, 10);
+}
+
+function normalizeMcpApprovalKind(value) {
+  const normalized = cleanText(value || "mcp").toLowerCase();
+  if (!/^[a-z0-9_-]{1,40}$/u.test(normalized)) {
+    return "mcp";
+  }
+  // Keep MCP in the normal approval lane. These kinds have provider-specific
+  // UI/actions elsewhere and should not be spoofable from a generic MCP client.
+  if (normalized === "payment" || normalized === "hazbase_wallet_payment" || normalized === "plan" || normalized === "question") {
+    return "mcp";
+  }
+  return normalized;
+}
+
+function createMcpPendingApproval(body, kind) {
+  const token = crypto.randomBytes(18).toString("hex");
+  const requestId = cleanText(body.requestId || crypto.randomUUID());
+  const title = cleanText(body.title || (kind === "question" ? "MCP question" : "MCP approval"));
+  const messageText = kind === "question"
+    ? mcpText(body.question || body.message || "")
+    : mcpText(body.messageText || body.message || "");
+  const requestKey = `mcp:${requestId}`;
+  const approval = {
+    token,
+    requestKey,
+    conversationId: "mcp",
+    requestId,
+    ownerClientId: null,
+    kind,
+    threadLabel: title || "MCP",
+    title,
+    messageText,
+    fileRefs: normalizeMcpStringArray(body.fileRefs),
+    previousFileRefs: [],
+    diffText: kind === "question" ? "" : mcpText(body.diffText || "", 100_000),
+    diffAvailable: kind !== "question" && Boolean(body.diffText),
+    diffSource: kind === "question" ? "" : "mcp",
+    diffAddedLines: 0,
+    diffRemovedLines: 0,
+    cwd: "",
+    workspaceRoot: "",
+    createdAtMs: Date.now(),
+    resolved: false,
+    resolving: false,
+    resolveMcpWaiter: null,
+    provider: "mcp",
+    planText: "",
+    questions: [],
+    notifyOnly: false,
+    readOnly: false,
+  };
+  if (kind === "question") {
+    approval.questions = [
+      {
+        question: mcpText(body.question || body.message || "", 2000),
+        options: normalizeMcpQuestionOptions(body.options),
+        multiSelect: body.multiSelect === true,
+      },
+    ];
+  }
+  return approval;
+}
+
+async function waitForMcpApprovalResult(runtime, approval, timeoutMs) {
+  const waitMs = mcpTimeoutMs(timeoutMs);
+  const result = await new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      resolve({ approved: false, decision: "timeout" });
+    }, waitMs);
+    approval.resolveMcpWaiter = (value) => {
+      clearTimeout(timer);
+      resolve(value);
+    };
+  });
+  if (!approval.resolved) {
+    approval.resolved = true;
+    approval.resolving = false;
+    runtime.nativeApprovalsByToken.delete(approval.token);
+    runtime.nativeApprovalsByRequestKey.delete(approval.requestKey);
+  }
+  return result;
+}
+
+async function handleMcpProviderEvent({ config, runtime, state, body, res }) {
+  const eventType = cleanText(body.eventType || "");
+  if (eventType === "status") {
+    return writeJson(res, 200, await buildMcpStatusResponse(config, runtime, state));
+  }
+
+  if (eventType === "notify") {
+    const title = cleanText(body.title || "MCP");
+    const messageText = mcpText(body.message || body.messageText || "");
+    if (!messageText) {
+      return writeJson(res, 400, { error: "missing-message" });
+    }
+    const stableId = `mcp_notify:${historyToken(`${title}:${messageText}:${Date.now()}`)}`;
+    const token = historyToken(stableId);
+    const entry = {
+      stableId,
+      token,
+      kind: "assistant_commentary",
+      threadId: "mcp",
+      threadLabel: cleanText(body.threadLabel || "MCP"),
+      title,
+      summary: formatNotificationBody(messageText, 160) || messageText,
+      messageText,
+      createdAtMs: Date.now(),
+      readOnly: true,
+      provider: "mcp",
+    };
+    const timelineChanged = recordTimelineEntry({ config, runtime, state, entry });
+    const historyChanged = recordHistoryItem({ config, runtime, state, item: entry });
+    const pushChanged = await deliverWebPushItem({
+      config,
+      state,
+      kind: "assistant_commentary",
+      tab: "timeline",
+      token,
+      stableId,
+      title,
+      body: messageText,
+    }).catch((error) => {
+      console.error(`[mcp-notify-push] ${error.message}`);
+      return false;
+    });
+    if (timelineChanged || historyChanged || pushChanged) {
+      await saveState(config.stateFile, state);
+    }
+    return writeJson(res, 200, { ok: true, token });
+  }
+
+  if (eventType === "approval_request" || eventType === "choice_request") {
+    const kind = eventType === "choice_request" ? "question" : normalizeMcpApprovalKind(body.approvalKind);
+    if (kind !== "question" && !mcpText(body.message || body.messageText || "")) {
+      return writeJson(res, 400, { error: "missing-message" });
+    }
+    if (kind === "question" && !mcpText(body.question || body.message || "")) {
+      return writeJson(res, 400, { error: "missing-question" });
+    }
+    const approval = createMcpPendingApproval(body, kind);
+    runtime.nativeApprovalsByToken.set(approval.token, approval);
+    runtime.nativeApprovalsByRequestKey.set(approval.requestKey, approval);
+    deliverWebPushItem({
+      config,
+      state,
+      kind: "approval",
+      tab: "inbox",
+      subtab: "pending",
+      token: approval.token,
+      stableId: pendingApprovalStableId(approval),
+      title: approval.title || "MCP",
+      body: approval.messageText,
+      buildLocalizedContent: () => ({
+        title: approval.title || "MCP",
+        body: approval.messageText,
+      }),
+    }).catch((error) => {
+      console.error(`[mcp-approval-push] ${approval.requestKey} | ${error.message}`);
+    });
+    const result = await waitForMcpApprovalResult(runtime, approval, body.timeoutMs);
+    return writeJson(res, 200, {
+      ok: true,
+      approved: result?.approved === true || result?.decision === "accept",
+      decision: result?.decision || (result?.approved ? "accept" : "reject"),
+      ...(result?.answerText ? { answerText: result.answerText } : {}),
+      ...(Array.isArray(result?.answers) ? { answers: result.answers } : {}),
+    });
+  }
+
+  return writeJson(res, 400, { error: "unsupported-mcp-event" });
+}
+
 function requestUserAgent(req) {
   return cleanText(req.headers?.["user-agent"] ?? "");
 }
@@ -10477,8 +11038,15 @@ function validatePairingPayload(payload, config, state) {
 
   const code = cleanText(payload?.code ?? "").toUpperCase();
   const token = cleanText(payload?.token ?? "");
-  const matchesCode = code && cleanText(config.pairingCode).toUpperCase() === code;
-  const matchesToken = token && cleanText(config.pairingToken) === token;
+  // Constant-time compare both sides — even with the 8/15min lockout the
+  // pairing token is long enough that a measurable timing prefix-attack
+  // could meaningfully reduce the brute-force search space.
+  const matchesCode =
+    !!code &&
+    constantTimeStringEqual(cleanText(config.pairingCode).toUpperCase(), code);
+  const matchesToken =
+    !!token &&
+    constantTimeStringEqual(cleanText(config.pairingToken), token);
   if (matchesToken) {
     return { ok: true, credential: `token:${token}` };
   }
@@ -10638,6 +11206,16 @@ function requestOrigin(req) {
 }
 
 function requireTrustedMutationOrigin(req, res, config) {
+  // Relay-dispatched requests have no Origin / Referer (the PWA's RPC
+  // frame doesn't synthesize one) and a non-loopback synthetic
+  // remoteAddress, so they would always 403 here. They're authenticated
+  // by the Noise channel binding instead — no browser-side CSRF surface
+  // exists because an attacker can't establish a Noise channel without
+  // the pairing's static key. See readSession() for the trust-model
+  // notes.
+  if (req.viveworker?.fromRelay) {
+    return true;
+  }
   const origin = requestOrigin(req);
   if (!origin) {
     if (isLoopbackRequest(req)) {
@@ -11285,7 +11863,7 @@ function buildTimelineResponse(runtime, state, config, locale) {
     threadLabel: entry.threadLabel,
     summary: entry.summary,
     fileEventType: normalizeTimelineFileEventType(entry.fileEventType ?? ""),
-    imageUrls: buildTimelineEntryImageUrls(entry),
+    imageUrls: buildTimelineEntryImageUrls(entry, config),
     fileRefs: normalizeTimelineFileRefs(entry.fileRefs ?? []),
     diffAvailable: Boolean(entry.diffAvailable),
     diffAddedLines: Math.max(0, Number(entry.diffAddedLines) || 0),
@@ -11794,7 +12372,35 @@ function buildHistoryDetail(item, locale, runtime = null) {
   };
 }
 
-function buildTimelineEntryImageUrls(entry) {
+function signTimelineEntryImageUrl(config, token, index, filePath) {
+  const secret = cleanText(config?.sessionSecret || "");
+  const normalizedToken = cleanText(token || "");
+  const normalizedPath = filePath ? path.resolve(String(filePath)) : "";
+  const normalizedIndex = Math.max(0, Number(index) || 0);
+  if (!secret || !normalizedToken || !normalizedPath) {
+    return "";
+  }
+  return crypto
+    .createHmac("sha256", secret)
+    .update(`${normalizedToken}\n${normalizedIndex}\n${normalizedPath}`)
+    .digest("base64url");
+}
+
+function isValidTimelineEntryImageSignature(config, url, token, index, filePath) {
+  const provided = cleanText(url?.searchParams?.get("imageToken") || "");
+  if (!provided) {
+    return false;
+  }
+  const expected = signTimelineEntryImageUrl(config, token, index, filePath);
+  if (!expected) {
+    return false;
+  }
+  const left = Buffer.from(provided, "utf8");
+  const right = Buffer.from(expected, "utf8");
+  return left.length === right.length && crypto.timingSafeEqual(left, right);
+}
+
+function buildTimelineEntryImageUrls(entry, config = null) {
   const imagePaths = normalizeTimelineImagePaths(entry?.imagePaths ?? []);
   if (imagePaths.length === 0) {
     return [];
@@ -11803,10 +12409,14 @@ function buildTimelineEntryImageUrls(entry) {
   if (!token) {
     return [];
   }
-  return imagePaths.map((_, index) => `/api/timeline/${encodeURIComponent(token)}/images/${index}`);
+  return imagePaths.map((filePath, index) => {
+    const imageToken = signTimelineEntryImageUrl(config, token, index, filePath);
+    const suffix = imageToken ? `?imageToken=${encodeURIComponent(imageToken)}` : "";
+    return `/api/timeline/${encodeURIComponent(token)}/images/${index}${suffix}`;
+  });
 }
 
-function buildTimelineMessageDetail(entry, locale, runtime = null) {
+function buildTimelineMessageDetail(entry, locale, runtime = null, config = null) {
   return {
     kind: entry.kind,
     token: entry.token,
@@ -11815,7 +12425,7 @@ function buildTimelineMessageDetail(entry, locale, runtime = null) {
     threadLabel: entry.threadLabel || "",
     createdAtMs: Number(entry.createdAtMs) || 0,
     messageHtml: renderMessageHtml(entry.messageText, `<p>${escapeHtml(t(locale, "detail.detailUnavailable"))}</p>`),
-    imageUrls: buildTimelineEntryImageUrls(entry),
+    imageUrls: buildTimelineEntryImageUrls(entry, config),
     fileRefs: normalizeTimelineFileRefs(entry.fileRefs ?? []),
     previousContext: buildInterruptedTimelineContext(runtime, entry, locale),
     interruptNotice: interruptedDetailNotice(entry.messageText, locale),
@@ -12307,6 +12917,18 @@ async function handleCompletionReply({
   );
   let lastError = null;
   const ownerClientId = runtime.threadOwnerClientIds.get(conversationId) ?? null;
+  const finalizeReplyAccepted = async () => {
+    if (timelineImageAliases.length > 0) {
+      const aliases = isPlainObject(state.timelineImagePathAliases)
+        ? state.timelineImagePathAliases
+        : (state.timelineImagePathAliases = {});
+      for (const [sourcePath, persistentPath] of timelineImageAliases) {
+        aliases[sourcePath] = persistentPath;
+      }
+      await saveState(config.stateFile, state);
+    }
+    scheduleBestEffortFileCleanup(stagedWorkspaceImagePaths);
+  };
 
   for (const candidate of turnCandidates) {
     try {
@@ -12329,21 +12951,22 @@ async function handleCompletionReply({
       console.log(
         `[completion-reply] success candidate=${candidate.name} transport=${cleanText(candidate.transport || "thread-follower")}`
       );
-      if (timelineImageAliases.length > 0) {
-        const aliases = isPlainObject(state.timelineImagePathAliases)
-          ? state.timelineImagePathAliases
-          : (state.timelineImagePathAliases = {});
-        for (const [sourcePath, persistentPath] of timelineImageAliases) {
-          aliases[sourcePath] = persistentPath;
-        }
-        await saveState(config.stateFile, state);
-      }
-      scheduleBestEffortFileCleanup(stagedWorkspaceImagePaths);
+      await finalizeReplyAccepted();
       return;
     } catch (error) {
-      lastError = error;
-      console.log(
-        `[completion-reply] failed candidate=${candidate.name} transport=${cleanText(candidate.transport || "thread-follower")} error=${normalizeIpcErrorMessage(error)} raw=${inspect(error?.ipcError ?? error, { depth: 6, breakLength: 160 })}`
+      if (isStartTurnAckTimeout(error)) {
+        // Codex can create the turn but fail to send the bridge an ACK before
+        // its internal follower timeout fires. Retrying risks duplicate user
+        // turns, so treat this as accepted and let the timeline catch up.
+        console.log(
+          `[completion-reply] accepted candidate=${candidate.name} transport=${cleanText(candidate.transport || "thread-follower")} ack-timeout=${normalizeIpcErrorMessage(error)}`
+        );
+        await finalizeReplyAccepted();
+        return;
+      }
+      lastError = error;
+      console.log(
+        `[completion-reply] failed candidate=${candidate.name} transport=${cleanText(candidate.transport || "thread-follower")} error=${normalizeIpcErrorMessage(error)} raw=${inspect(error?.ipcError ?? error, { depth: 6, breakLength: 160 })}`
       );
     }
   }
@@ -13030,7 +13653,12 @@ async function autoApproveTrustedWrite({
 }
 
 async function handleNativeApprovalDecision({ config, runtime, state, approval, decision }) {
-  if (approval.resolveClaudeWaiter) {
+  if (approval.resolveMcpWaiter) {
+    approval.resolveMcpWaiter({
+      approved: decision === "accept",
+      decision,
+    });
+  } else if (approval.resolveClaudeWaiter) {
     if (approval.provider === "claude" && approval.kind === "plan") {
       // ExitPlanMode cannot be truly auto-approved via permissionDecision: "allow"
       // (Claude still shows the native PC plan dialog). Instead, deny the tool
@@ -13120,7 +13748,7 @@ async function buildApiItemDetail({ config, runtime, state, kind, token, locale
   if (timelineMessageKinds.has(kind)) {
     const entry = timelineEntryByToken(runtime, token, kind);
     if (!entry) return null;
-    const detail = buildTimelineMessageDetail(entry, locale, runtime);
+    const detail = buildTimelineMessageDetail(entry, locale, runtime, config);
     // Add reply support for Codex assistant_final entries only (replaces completion reply).
     // Check directly against timeline entries (not history items) to avoid
     // maxHistoryItems eviction issues.
@@ -13321,8 +13949,11 @@ async function buildApiItemDetail({ config, runtime, state, kind, token, locale
   return historyItem ? buildHistoryDetail(historyItem, locale, runtime) : null;
 }
 
-function resolveTimelineEntryImagePath(runtime, token, index) {
-  const entry = timelineEntryByToken(runtime, token);
+function resolveTimelineEntryImagePath(runtime, state, token, index) {
+  const normalizedToken = cleanText(token || "");
+  const entry = timelineEntryByToken(runtime, normalizedToken)
+    || (state?.recentTimelineEntries ?? []).find((candidate) => cleanText(candidate?.token || "") === normalizedToken)
+    || null;
   if (!entry) {
     return "";
   }
@@ -13398,13 +14029,32 @@ const GZIPPABLE_EXTENSIONS = new Set([
 ]);
 const MIN_GZIP_BYTES = 512;
 
+function renderWebAssetBuffer(filePath, raw) {
+  const basename = path.basename(filePath);
+  if (basename !== "index.html" && basename !== "sw.js" && basename !== "app.js") {
+    return raw;
+  }
+
+  const text = raw.toString("utf8");
+  if (!text.includes(WEB_APP_BUILD_ID_PLACEHOLDER)) {
+    return raw;
+  }
+
+  return Buffer.from(text.replaceAll(WEB_APP_BUILD_ID_PLACEHOLDER, WEB_APP_BUILD_ID), "utf8");
+}
+
 async function loadWebAssetEntry(filePath) {
   const stat = await fs.stat(filePath);
   const cached = WEB_ASSET_CACHE.get(filePath);
-  if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) {
+  if (
+    cached &&
+    cached.mtimeMs === stat.mtimeMs &&
+    cached.sourceSize === stat.size &&
+    cached.buildId === WEB_APP_BUILD_ID
+  ) {
     return cached;
   }
-  const raw = await fs.readFile(filePath);
+  const raw = renderWebAssetBuffer(filePath, await fs.readFile(filePath));
   const extension = path.extname(filePath).toLowerCase();
   let gzip = null;
   if (GZIPPABLE_EXTENSIONS.has(extension) && raw.length >= MIN_GZIP_BYTES) {
@@ -13418,7 +14068,8 @@ async function loadWebAssetEntry(filePath) {
     raw,
     gzip,
     mtimeMs: stat.mtimeMs,
-    size: stat.size,
+    sourceSize: stat.size,
+    buildId: WEB_APP_BUILD_ID,
     contentType: contentTypeForFile(filePath),
   };
   WEB_ASSET_CACHE.set(filePath, entry);
@@ -13562,6 +14213,23 @@ function buildWebAppHtml({ pairToken }) {
         font-family: "Avenir Next", "SF Pro Rounded", "SF Pro Text", "Helvetica Neue", sans-serif;
         font-size: 0.9rem;
         letter-spacing: 0.02em;
+        min-height: 1.25em;
+        transition: opacity 160ms ease, transform 160ms ease;
+      }
+      .boot-splash__hint {
+        max-width: 15rem;
+        margin: -0.35rem 0 0;
+        color: rgba(178, 196, 210, 0.58);
+        font-family: "Avenir Next", "SF Pro Rounded", "SF Pro Text", "Helvetica Neue", sans-serif;
+        font-size: 0.78rem;
+        line-height: 1.45;
+        opacity: 0;
+        transform: translateY(-0.2rem);
+        transition: opacity 220ms ease, transform 220ms ease;
+      }
+      .boot-splash__hint.is-visible {
+        opacity: 1;
+        transform: translateY(0);
       }
       .boot-splash__dots {
         display: inline-grid;
@@ -13588,6 +14256,8 @@ function buildWebAppHtml({ pairToken }) {
       }
       @media (prefers-reduced-motion: reduce) {
         .boot-splash,
+        .boot-splash__status,
+        .boot-splash__hint,
         .boot-splash__dots span {
           transition: none;
           animation: none;
@@ -13601,12 +14271,23 @@ function buildWebAppHtml({ pairToken }) {
       <div class="boot-splash__card">
         <img class="boot-splash__logo" src="/icons/viveworker-v-pulse.svg" alt="" width="112" height="112" decoding="async">
         <h1 class="boot-splash__title">viveworker</h1>
-        <p class="boot-splash__status">Starting</p>
+        <p id="boot-splash-status" class="boot-splash__status">Checking your trusted Wi-Fi...</p>
+        <p id="boot-splash-hint" class="boot-splash__hint" hidden>The first remote connection can take tens of seconds.</p>
         <span class="boot-splash__dots" aria-hidden="true"><span></span><span></span><span></span></span>
       </div>
     </div>
     <div id="app"></div>
-    <script type="module" src="/app.js"></script>
+    <script>
+      (() => {
+        const isJa = (navigator.language || "").toLowerCase().startsWith("ja");
+        const message = isJa ? "同じWi-Fi内のPCを確認中..." : "Checking your trusted Wi-Fi...";
+        const status = document.getElementById("boot-splash-status");
+        const splash = document.getElementById("boot-splash");
+        if (status) status.textContent = message;
+        if (splash) splash.setAttribute("aria-label", \`viveworker \${message}\`);
+      })();
+    </script>
+    <script type="module" src="${WEB_APP_SCRIPT_URL}"></script>
   </body>
 </html>`;
 }
@@ -13615,10 +14296,132 @@ function resolvePagePairingToken({ req, config, state, requestedToken }) {
   return resolveManifestPairingToken({ config, state, requestedToken });
 }
 
+function normalizeBootTraceEvent(event) {
+  if (!event || typeof event !== "object" || Array.isArray(event)) {
+    return null;
+  }
+  const normalized = {
+    tMs: Math.max(0, Math.min(600_000, Math.round(Number(event.tMs) || 0))),
+    type: cleanText(event.type || "").slice(0, 80),
+  };
+  if (!normalized.type) {
+    return null;
+  }
+  const phase = cleanText(event.phase || "").slice(0, 80);
+  const stateValue = cleanText(event.state || "").slice(0, 80);
+  const previousState = cleanText(event.previousState || "").slice(0, 80);
+  const reason = cleanText(event.reason || "").slice(0, 120);
+  const urlPath = cleanText(event.url || "").split("?")[0].slice(0, 120);
+  if (phase) normalized.phase = phase;
+  if (stateValue) normalized.state = stateValue;
+  if (previousState) normalized.previousState = previousState;
+  if (reason) normalized.reason = reason;
+  if (urlPath) normalized.url = urlPath;
+  if (event.sticky === true || event.sticky === false) normalized.sticky = event.sticky;
+  if (Number.isFinite(Number(event.code))) normalized.code = Math.round(Number(event.code));
+  if (event.resumed === true || event.resumed === false) normalized.resumed = event.resumed;
+  return normalized;
+}
+
+function formatBootTraceEvent(event) {
+  const parts = [`${event.tMs}ms`, event.type];
+  if (event.phase) parts.push(event.phase);
+  if (event.state) {
+    parts.push(event.previousState ? `${event.previousState}->${event.state}` : event.state);
+  }
+  if (event.url) parts.push(event.url);
+  if (event.reason) parts.push(`reason=${event.reason}`);
+  if (event.sticky === true) parts.push("sticky=1");
+  if (event.code) parts.push(`code=${event.code}`);
+  if (event.resumed === true || event.resumed === false) parts.push(`resumed=${event.resumed ? 1 : 0}`);
+  return parts.join(":");
+}
+
+function logRemotePairingBootTrace(body, session, req) {
+  const traceId = cleanText(body?.traceId || "").slice(0, 80) || "unknown";
+  const reason = cleanText(body?.reason || "").slice(0, 80) || "unknown";
+  const appBuildId = cleanText(body?.appBuildId || "").slice(0, 80) || "unknown";
+  const totalMs = Math.max(0, Math.min(600_000, Math.round(Number(body?.totalMs) || 0)));
+  const remoteRouteSeen = body?.remoteRouteSeen === true;
+  const eventList = Array.isArray(body?.events) ? body.events : [];
+  const events = eventList
+    .slice(-90)
+    .map(normalizeBootTraceEvent)
+    .filter(Boolean);
+  const phases = events
+    .filter((event) => event.type === "route" && event.phase)
+    .map((event) => `${event.tMs}:${event.phase}`)
+    .join(" > ");
+  const transport = events
+    .filter((event) => event.phase === "remote-transport-state" || event.phase === "remote-transport-error")
+    .map((event) => {
+      if (event.phase === "remote-transport-error") return `${event.tMs}:error(${event.reason || "unknown"})`;
+      return `${event.tMs}:${event.previousState || "?"}->${event.state || "?"}${event.reason ? `(${event.reason})` : ""}`;
+    })
+    .join(" > ");
+  const deviceId = cleanText(session?.deviceId || "").slice(0, 60) || "unknown";
+  const ua = requestUserAgent(req).slice(0, 90);
+
+  console.log(
+    `[remote-pairing-boot] trace=${traceId} device=${deviceId} reason=${reason} ` +
+    `total=${totalMs}ms remote=${remoteRouteSeen ? 1 : 0} build=${appBuildId} ` +
+    `events=${events.length} ua=${JSON.stringify(ua)}`
+  );
+  if (phases) {
+    console.log(`[remote-pairing-boot-phases] trace=${traceId} ${phases}`);
+  }
+  if (transport) {
+    console.log(`[remote-pairing-boot-transport] trace=${traceId} ${transport}`);
+  }
+  if (totalMs >= 5_000 || remoteRouteSeen) {
+    console.log(`[remote-pairing-boot-detail] trace=${traceId} ${events.map(formatBootTraceEvent).join(" | ")}`);
+  }
+}
+
+function recordRemotePairingAudit(event) {
+  appendRemotePairingAuditEvent({
+    atMs: Date.now(),
+    ...event,
+  }).catch((err) => {
+    console.warn(`[remote-pairing-audit] write failed: ${err?.message}`);
+  });
+}
+
+function remotePairingAuditFieldsForPairing(pairing) {
+  if (!pairing) return {};
+  return {
+    pairingId: redactShortId(pairing.pairingId),
+    phoneFingerprint: pairing.phoneFingerprint || "",
+    label: pairing.label || "",
+    deviceId: pairing.deviceId || "",
+  };
+}
+
+function redactShortId(value) {
+  const text = cleanText(value || "").slice(0, 80);
+  return text ? `${text.slice(0, 6)}…` : "";
+}
+
+function relayHostForAudit(value) {
+  try {
+    return new URL(value || DEFAULT_RELAY_URL).host;
+  } catch {
+    return "";
+  }
+}
+
+function shouldAutoRotateRemotePairingToken(pairing, now = Date.now()) {
+  if (!pairing) return false;
+  const updatedAt = Number(pairing.relayTokenUpdatedAtMs) || 0;
+  if (!updatedAt) return true;
+  return now - updatedAt >= REMOTE_PAIRING_RELAY_TOKEN_ROTATION_MS;
+}
+
 function createNativeApprovalServer({ config, runtime, state }) {
   const requestHandler = async (req, res) => {
     try {
       const url = new URL(req.url, config.nativeApprovalPublicBaseUrl);
+      refreshPairingConfigFromEnvFile(config);
 
       if (url.pathname === "/health") {
         return writeJson(res, 200, { ok: true });
@@ -13668,10 +14471,20 @@ function createNativeApprovalServer({ config, runtime, state }) {
       if (
         url.pathname === "/app.js" ||
         url.pathname === "/app.css" ||
+        url.pathname === "/build-id.js" ||
         url.pathname === "/i18n.js" ||
         url.pathname === "/hazbase-passkey.js" ||
         url.pathname === "/sw.js" ||
-        url.pathname.startsWith("/icons/")
+        url.pathname.startsWith("/icons/") ||
+        // Remote-pairing PWA modules + their generated crypto bundle.
+        // The bundle is auto-built by scripts/build-remote-pairing-bundle.mjs
+        // and the per-module wrappers under web/remote-pairing/ import from it.
+        // resolveWebAsset() still enforces the webRoot containment check, so
+        // a wide-prefix allowlist here is safe against path traversal.
+        url.pathname.startsWith("/remote-pairing/") ||
+        url.pathname === "/remote-pairing.bundle.js" ||
+        url.pathname === "/remote-pairing.bundle.js.map" ||
+        url.pathname === "/remote-pairing.bundle.js.LEGAL.txt"
       ) {
         const served = await serveWebAsset(res, url.pathname, req);
         if (served) {
@@ -13847,9 +14660,10 @@ function createNativeApprovalServer({ config, runtime, state }) {
         }
         const sessionPayload = buildSessionPayload({ config, state, session });
         if (!session.authenticated) {
-          return writeJson(res, 200, { session: sessionPayload });
+          return writeJson(res, 200, { appBuildId: WEB_APP_BUILD_ID, session: sessionPayload });
         }
         return writeJson(res, 200, {
+          appBuildId: WEB_APP_BUILD_ID,
           session: sessionPayload,
           inbox: buildInboxFastResponse(runtime, state, config, localeInfo.locale),
           timeline: buildTimelineResponse(runtime, state, config, localeInfo.locale),
@@ -14576,6 +15390,512 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
         return writeJson(res, 200, { ok: true, acceptPublicTasks: accept });
       }
 
+      // ─── Remote pairing (off-LAN PWA relay) ──────────────────────────
+
+      // GET /api/remote-pairing/status — settings UI bootstrap.
+      //
+      // Returns the current orchestrator state plus the (read-only) list of
+      // pairings on disk. Sessions only exist when `enabled: true`; when the
+      // relay is off we still surface the pairings so the user can revoke
+      // before re-enabling.
+      if (url.pathname === "/api/remote-pairing/status" && req.method === "GET") {
+        const session = requireApiSession(req, res, config, state);
+        if (!session) return;
+        const status = getRemotePairingStatus(runtime);
+        let pairings = [];
+        let auditEvents = [];
+        try {
+          const list = await loadPairings();
+          pairings = list.map((p) => ({
+            pairingId: p.pairingId,
+            label: p.label || "",
+            phonePub: p.phonePub,
+            phoneFingerprint: p.phoneFingerprint,
+            deviceId: p.deviceId || null,
+            addedAtMs: p.addedAtMs ?? null,
+            relayTokenUpdatedAtMs: p.relayTokenUpdatedAtMs ?? null,
+            lastSeenAtMs: p.lastSeenAtMs ?? null,
+          }));
+        } catch (err) {
+          console.warn(`[remote-pairing] status: failed to load pairings: ${err?.message}`);
+        }
+        try {
+          auditEvents = await readRemotePairingAuditEvents({ limit: 12 });
+        } catch (err) {
+          console.warn(`[remote-pairing] status: failed to load audit log: ${err?.message}`);
+        }
+        return writeJson(res, 200, {
+          enabled: status.enabled,
+          relayUrl: status.relayUrl,
+          configuredRelayUrl: config.remotePairingRelayUrl || "",
+          identityFingerprint: status.identityFingerprint,
+          identityPubHex: status.identityPubHex,
+          sessions: status.sessions,
+          pairings,
+          auditEvents,
+          pairingsFile: REMOTE_PAIRINGS_FILE,
+        });
+      }
+
+      // POST /api/remote-pairing/boot-trace — PWA cold-start timing.
+      //
+      // This is intentionally diagnostics-only: it does not mutate state and
+      // only logs a sanitized, capped phase timeline so off-LAN boot latency
+      // can be debugged without attaching Safari Web Inspector to the phone.
+      if (url.pathname === "/api/remote-pairing/boot-trace" && req.method === "POST") {
+        const session = requireApiSession(req, res, config, state);
+        if (!session) return;
+        let body;
+        try {
+          body = await parseJsonBody(req);
+        } catch (err) {
+          return writeJson(res, 400, { error: "invalid-json-body", message: err.message });
+        }
+        try {
+          logRemotePairingBootTrace(body, session, req);
+        } catch (err) {
+          console.warn(`[remote-pairing-boot] failed to log trace: ${err?.message}`);
+        }
+        return writeJson(res, 200, { ok: true });
+      }
+
+      // POST /api/remote-pairing/toggle — flip on/off without restart.
+      //
+      // Body: { enabled: boolean }
+      // Persists to ~/.viveworker/remote-pairing.env (so the next bridge
+      // launch starts in the new state) and hot-restarts the orchestrator.
+      // The same approval server's request handler is reused, so cookies /
+      // session auth behave identically over LAN HTTP and the relay.
+      if (url.pathname === "/api/remote-pairing/toggle" && req.method === "POST") {
+        const session = requireMutatingApiSession(req, res, config, state);
+        if (!session) return;
+        let body;
+        try {
+          body = await parseJsonBody(req);
+        } catch (err) {
+          return writeJson(res, 400, { error: "invalid-json-body", message: err.message });
+        }
+        if (typeof body?.enabled !== "boolean") {
+          return writeJson(res, 400, { error: "enabled-required", message: "body.enabled must be a boolean" });
+        }
+        if (typeof requestHandler !== "function") {
+          return writeJson(res, 503, { error: "request-handler-unavailable" });
+        }
+        const next = body.enabled;
+        config.remotePairingEnabled = next;
+        recordRemotePairingAudit({
+          type: next ? "relay_enabled" : "relay_disabled",
+          outcome: "info",
+          deviceId: session.deviceId || "",
+          relayHost: relayHostForAudit(config.remotePairingRelayUrl || DEFAULT_RELAY_URL),
+        });
+        try {
+          await persistRemotePairingEnv({ enabled: next });
+        } catch (err) {
+          // Persistence failure shouldn't roll back the in-memory config —
+          // the user can retry from the UI and the runtime is still in the
+          // intended state. Surface the error clearly.
+          console.error(`[remote-pairing] env persist failed: ${err?.message}`);
+        }
+        try {
+          await restartRemotePairingRelay({
+            runtime,
+            config,
+            requestListener: requestHandler,
+            logger: console,
+            auditEventSink: recordRemotePairingAudit,
+          });
+        } catch (err) {
+          console.error(`[remote-pairing] hot-restart failed: ${err?.message}`);
+          return writeJson(res, 500, { error: "restart-failed", message: err.message });
+        }
+        const status = getRemotePairingStatus(runtime);
+        return writeJson(res, 200, {
+          ok: true,
+          enabled: status.enabled,
+          relayUrl: status.relayUrl,
+          identityFingerprint: status.identityFingerprint,
+          sessions: status.sessions,
+        });
+      }
+
+      // POST /api/remote-pairing/relay-url — change the relay endpoint.
+      //
+      // Body: { relayUrl: string | null }
+      //   - empty string / null  → falls back to DEFAULT_RELAY_URL
+      //   - non-empty string     → must be wss://, except ws:// loopback for local dev
+      // Persists + hot-restarts (only restarts if currently enabled, since
+      // a dormant handle has nothing to reconnect).
+      if (url.pathname === "/api/remote-pairing/relay-url" && req.method === "POST") {
+        const session = requireMutatingApiSession(req, res, config, state);
+        if (!session) return;
+        let body;
+        try {
+          body = await parseJsonBody(req);
+        } catch (err) {
+          return writeJson(res, 400, { error: "invalid-json-body", message: err.message });
+        }
+        const raw = body?.relayUrl;
+        const relayUrlResult = normalizeRemotePairingRelayUrl(raw ?? "");
+        if (!relayUrlResult.ok) {
+          return writeJson(res, 400, {
+            error: "invalid-relay-url",
+            message: relayUrlResult.message,
+          });
+        }
+        const normalized = relayUrlResult.value;
+        config.remotePairingRelayUrl = normalized;
+        recordRemotePairingAudit({
+          type: "relay_url_changed",
+          outcome: "info",
+          deviceId: session.deviceId || "",
+          relayHost: relayHostForAudit(normalized || DEFAULT_RELAY_URL),
+        });
+        try {
+          await persistRemotePairingEnv({ relayUrl: normalized || null });
+        } catch (err) {
+          console.error(`[remote-pairing] env persist failed: ${err?.message}`);
+        }
+        if (config.remotePairingEnabled && typeof requestHandler === "function") {
+          try {
+            await restartRemotePairingRelay({
+              runtime,
+              config,
+              requestListener: requestHandler,
+              logger: console,
+              auditEventSink: recordRemotePairingAudit,
+            });
+          } catch (err) {
+            console.error(`[remote-pairing] hot-restart failed: ${err?.message}`);
+            return writeJson(res, 500, { error: "restart-failed", message: err.message });
+          }
+        }
+        const status = getRemotePairingStatus(runtime);
+        return writeJson(res, 200, {
+          ok: true,
+          enabled: status.enabled,
+          relayUrl: status.relayUrl,
+          configuredRelayUrl: config.remotePairingRelayUrl || "",
+        });
+      }
+
+      // POST /api/remote-pairing/revoke — drop a pairing by phonePub.
+      //
+      // Body: { phonePub: string }  (64-char hex, the phone's static X25519 pub)
+      // Removes the entry from `~/.viveworker/remote-pairings.json` and
+      // calls reloadNow() so the orchestrator tears the live session down.
+      // No-op if the pub isn't on file (idempotent).
+      if (url.pathname === "/api/remote-pairing/revoke" && req.method === "POST") {
+        const session = requireMutatingApiSession(req, res, config, state);
+        if (!session) return;
+        let body;
+        try {
+          body = await parseJsonBody(req);
+        } catch (err) {
+          return writeJson(res, 400, { error: "invalid-json-body", message: err.message });
+        }
+        const phonePub = typeof body?.phonePub === "string" ? body.phonePub.trim().toLowerCase() : "";
+        if (!/^[0-9a-f]{64}$/u.test(phonePub)) {
+          return writeJson(res, 400, {
+            error: "invalid-phone-pub",
+            message: "phonePub must be a 64-char hex string",
+          });
+        }
+        let beforeLen = 0;
+        let afterLen = 0;
+        let removedPairing = null;
+        try {
+          const before = await loadPairings();
+          beforeLen = before.length;
+          removedPairing = before.find((p) => p.phonePub === phonePub) || null;
+          const after = await removePairingPersisted(phonePub);
+          afterLen = after.length;
+        } catch (err) {
+          return writeJson(res, 500, { error: "revoke-failed", message: err.message });
+        }
+        const removed = beforeLen !== afterLen;
+        if (removed && runtime.remotePairingHandle) {
+          try {
+            await runtime.remotePairingHandle.reloadNow();
+          } catch (err) {
+            console.warn(`[remote-pairing] reloadNow after revoke failed: ${err?.message}`);
+          }
+        }
+        if (removed) {
+          recordRemotePairingAudit({
+            type: "pairing_revoked",
+            outcome: "info",
+            deviceId: session.deviceId || "",
+            ...remotePairingAuditFieldsForPairing(removedPairing),
+          });
+        }
+        return writeJson(res, 200, { ok: true, removed, remaining: afterLen });
+      }
+
+      // POST /api/remote-pairing/rotate-token — rotate the relay capability
+      // for the current LAN-reachable paired phone. This endpoint is also
+      // denied inside the relay dispatcher, so an off-LAN phone cannot rotate
+      // itself into a split-brain state where the bridge updated but the PWA
+      // failed to persist the new token.
+      if (url.pathname === "/api/remote-pairing/rotate-token" && req.method === "POST") {
+        const session = requireMutatingApiSession(req, res, config, state);
+        if (!session) return;
+        let body;
+        try {
+          body = await parseJsonBody(req);
+        } catch (err) {
+          return writeJson(res, 400, { error: "invalid-json-body", message: err.message });
+        }
+        const phonePub = typeof body?.phonePub === "string" ? body.phonePub.trim().toLowerCase() : "";
+        if (!/^[0-9a-f]{64}$/u.test(phonePub)) {
+          return writeJson(res, 400, {
+            error: "invalid-phone-pub",
+            message: "phonePub must be a 64-char hex string",
+          });
+        }
+
+        let current = [];
+        try {
+          current = await loadPairings();
+        } catch (err) {
+          return writeJson(res, 500, { error: "load-pairings-failed", message: err.message });
+        }
+        const existing = current.find((p) => p.phonePub === phonePub) || null;
+        if (!existing) {
+          return writeJson(res, 404, { error: "pairing-not-found" });
+        }
+        if (existing.deviceId && session.deviceId && existing.deviceId !== session.deviceId) {
+          recordRemotePairingAudit({
+            type: "token_rotate_denied",
+            outcome: "failure",
+            deviceId: session.deviceId || "",
+            reason: "device mismatch",
+            ...remotePairingAuditFieldsForPairing(existing),
+          });
+          return writeJson(res, 403, { error: "device-mismatch" });
+        }
+
+        let rotated;
+        try {
+          ({ rotated } = await rotateRelayTokenPersisted(phonePub));
+        } catch (err) {
+          recordRemotePairingAudit({
+            type: "token_rotate_failed",
+            outcome: "failure",
+            deviceId: session.deviceId || "",
+            reason: err.message,
+            ...remotePairingAuditFieldsForPairing(existing),
+          });
+          return writeJson(res, 500, { error: "rotate-token-failed", message: err.message });
+        }
+        if (!rotated) {
+          return writeJson(res, 404, { error: "pairing-not-found" });
+        }
+
+        if (runtime.remotePairingHandle) {
+          try {
+            await runtime.remotePairingHandle.reloadNow();
+          } catch (err) {
+            console.warn(`[remote-pairing] reloadNow after token rotation failed: ${err?.message}`);
+          }
+        }
+
+        let bridgeKeypair;
+        try {
+          bridgeKeypair = await ensureIdentityKeypair();
+        } catch (err) {
+          return writeJson(res, 500, {
+            error: "bridge-keypair-failed",
+            message: err.message,
+          });
+        }
+        const relayUrl = (config.remotePairingRelayUrl || "").trim() || DEFAULT_RELAY_URL;
+        recordRemotePairingAudit({
+          type: "token_rotated",
+          outcome: "success",
+          deviceId: session.deviceId || "",
+          relayHost: relayHostForAudit(relayUrl),
+          ...remotePairingAuditFieldsForPairing(rotated),
+        });
+
+        return writeJson(res, 200, {
+          ok: true,
+          pairingId: rotated.pairingId,
+          relayToken: rotated.relayToken,
+          phonePub: rotated.phonePub,
+          phoneFingerprint: rotated.phoneFingerprint,
+          deviceId: rotated.deviceId || null,
+          bridgePubHex: bytesToHex(bridgeKeypair.pub),
+          bridgeFingerprint: fingerprintIdentity(bridgeKeypair.pub),
+          relayUrl,
+          label: rotated.label,
+          addedAtMs: rotated.addedAtMs,
+          relayTokenUpdatedAtMs: rotated.relayTokenUpdatedAtMs ?? null,
+        });
+      }
+
+      // POST /api/remote-pairing/lan-enroll — finalize a LAN pairing by
+      // exchanging X25519 static pubkeys so the same phone can later reach
+      // the bridge via the relay (when off-LAN).
+      //
+      // Body: { phonePubHex: string (64-hex), label?: string (≤200 chars) }
+      // Returns: { ok, pairingId, relayToken, phonePub, phoneFingerprint, bridgePubHex,
+      //            bridgeFingerprint, relayUrl, label, addedAtMs }
+      //
+      // Side effects:
+      //   - Adds (or refreshes) the phone in ~/.viveworker/remote-pairings.json.
+      //     Idempotent on phonePub: re-pairing the same device keeps the
+      //     existing pairingId so the relay slot doesn't churn (any in-flight
+      //     remote session for that phone stays valid).
+      //   - Triggers runtime.remotePairingHandle.reloadNow() so the
+      //     orchestrator spawns a session for the new phone immediately
+      //     when the relay is currently on. Safe no-op when the relay is off
+      //     — the next toggle-on will pick up the new entry from disk.
+      //   - Calls ensureIdentityKeypair(), which generates the bridge's
+      //     static keypair on first run. After this endpoint succeeds the
+      //     bridge always has a stable identity.
+      //
+      // Auth: requires an authenticated session. The natural caller is the
+      // LAN-paired phone right after /api/session/pair succeeds — the
+      // session cookie set by that endpoint is what gates this one.
+      if (url.pathname === "/api/remote-pairing/lan-enroll" && req.method === "POST") {
+        const session = requireMutatingApiSession(req, res, config, state);
+        if (!session) return;
+        let body;
+        try {
+          body = await parseJsonBody(req);
+        } catch (err) {
+          return writeJson(res, 400, { error: "invalid-json-body", message: err.message });
+        }
+        const phonePubHex = typeof body?.phonePubHex === "string"
+          ? body.phonePubHex.trim().toLowerCase()
+          : "";
+        if (!/^[0-9a-f]{64}$/u.test(phonePubHex)) {
+          return writeJson(res, 400, {
+            error: "invalid-phone-pub",
+            message: "phonePubHex must be a 64-char hex string",
+          });
+        }
+        // Cap label at 200 chars — the persisted JSON has no hard limit but
+        // long strings make the settings UI ugly and there's no legitimate
+        // reason for a device label to exceed this.
+        const label = typeof body?.label === "string"
+          ? body.label.trim().slice(0, 200)
+          : "";
+
+        // Idempotent re-enroll: if the same phone re-pairs (e.g. user
+        // cleared site data on the phone, regenerated the keypair, then
+        // happened to land on the same hex — vanishingly unlikely; far more
+        // commonly: same keypair, fresh label), keep the original pairingId.
+        let existingPairings = [];
+        try {
+          existingPairings = await loadPairings();
+        } catch (err) {
+          return writeJson(res, 500, {
+            error: "load-pairings-failed",
+            message: err.message,
+          });
+        }
+        const existing = existingPairings.find((p) => p.phonePub === phonePubHex);
+        const pairingId = existing?.pairingId || crypto.randomUUID();
+        const autoRotateToken = shouldAutoRotateRemotePairingToken(existing);
+        const relayToken = autoRotateToken ? undefined : existing?.relayToken || undefined;
+        const relayTokenUpdatedAtMs = autoRotateToken ? Date.now() : existing?.relayTokenUpdatedAtMs;
+
+        // Bridge identity — generates on first call. We can't lean on
+        // runtime.remotePairingHandle here because the relay may be OFF
+        // (in which case the handle is dormant and identityKeypair is
+        // null), but enrollment still has to expose a stable bridge pub
+        // so the phone can store it.
+        let bridgeKeypair;
+        try {
+          bridgeKeypair = await ensureIdentityKeypair();
+        } catch (err) {
+          return writeJson(res, 500, {
+            error: "bridge-keypair-failed",
+            message: err.message,
+          });
+        }
+
+        let entry;
+        try {
+          entry = buildPairing({
+            pairingId,
+            relayToken,
+            relayTokenUpdatedAtMs,
+            phonePub: phonePubHex,
+            label,
+            deviceId: session.deviceId,
+          });
+        } catch (err) {
+          return writeJson(res, 400, {
+            error: "build-pairing-failed",
+            message: err.message,
+          });
+        }
+
+        try {
+          await addPairingPersisted(entry);
+        } catch (err) {
+          return writeJson(res, 500, {
+            error: "save-pairings-failed",
+            message: err.message,
+          });
+        }
+
+        // Kick the orchestrator if it's running so the new pairing's
+        // session spawns without waiting for the fs.watch debounce. When
+        // the relay is off this is a no-op (dormant handle's reloadNow is
+        // safe to call).
+        if (runtime.remotePairingHandle) {
+          try {
+            await runtime.remotePairingHandle.reloadNow();
+          } catch (err) {
+            console.warn(`[remote-pairing] reloadNow after lan-enroll failed: ${err?.message}`);
+          }
+        }
+        recordRemotePairingAudit({
+          type: existing ? "pairing_refreshed" : "pairing_enrolled",
+          outcome: "success",
+          deviceId: session.deviceId || "",
+          relayHost: relayHostForAudit(config.remotePairingRelayUrl || DEFAULT_RELAY_URL),
+          ...remotePairingAuditFieldsForPairing(entry),
+        });
+        if (existing && autoRotateToken) {
+          recordRemotePairingAudit({
+            type: "token_auto_rotated",
+            outcome: "success",
+            deviceId: session.deviceId || "",
+            relayHost: relayHostForAudit(config.remotePairingRelayUrl || DEFAULT_RELAY_URL),
+            reason: existing.relayTokenUpdatedAtMs ? "scheduled LAN refresh" : "legacy token metadata",
+            ...remotePairingAuditFieldsForPairing(entry),
+          });
+        }
+
+        const bridgePubHex = bytesToHex(bridgeKeypair.pub);
+        const bridgeFingerprint = fingerprintIdentity(bridgeKeypair.pub);
+        // Relay URL: explicit config value > orchestrator default. We
+        // surface the resolved URL (not the configured one) so the phone
+        // doesn't have to know about the fallback chain.
+        const relayUrl = (config.remotePairingRelayUrl || "").trim() || DEFAULT_RELAY_URL;
+
+        return writeJson(res, 200, {
+          ok: true,
+          pairingId: entry.pairingId,
+          relayToken: entry.relayToken,
+          phonePub: entry.phonePub,
+          phoneFingerprint: entry.phoneFingerprint,
+          deviceId: entry.deviceId || null,
+          bridgePubHex,
+          bridgeFingerprint,
+          relayUrl,
+          label: entry.label,
+          addedAtMs: entry.addedAtMs,
+          relayTokenUpdatedAtMs: entry.relayTokenUpdatedAtMs ?? null,
+          relayTokenRotated: existing ? autoRotateToken : false,
+        });
+      }
+
       // ─── Thread sharing ──────────────────────────────────────────────
 
       function buildThreadShareContent(shareType, body) {
@@ -14727,7 +16047,7 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
               messageText: content,
               createdAtMs: share.createdAtMs,
               readOnly: false,
-              provider: "viveworker",
+              provider: sourceTool === "mcp" ? "mcp" : "viveworker",
             },
           });
           await saveState(config.stateFile, state);
@@ -15231,6 +16551,22 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
         return writeJson(res, 403, { approved: false, decision: "decline", error: "payment-approval-declined" });
       }
 
+      if (url.pathname === "/api/providers/mcp/events" && req.method === "POST") {
+        const hookSecret = req.headers["x-viveworker-hook-secret"] || "";
+        if (!config.sessionSecret || hookSecret !== config.sessionSecret) {
+          return writeJson(res, 401, { error: "unauthorized" });
+        }
+
+        let body;
+        try {
+          body = await parseJsonBody(req);
+        } catch {
+          return writeJson(res, 400, { error: "invalid-json-body" });
+        }
+
+        return handleMcpProviderEvent({ config, runtime, state, body, res });
+      }
+
       if (url.pathname === "/api/providers/claude/events" && req.method === "POST") {
         const hookSecret = req.headers["x-viveworker-hook-secret"] || "";
         if (!config.sessionSecret || hookSecret !== config.sessionSecret) {
@@ -15925,18 +17261,20 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
 
       const apiTimelineImageMatch = url.pathname.match(/^\/api\/timeline\/([^/]+)\/images\/(\d+)$/u);
       if (apiTimelineImageMatch && req.method === "GET") {
-        const session = requireApiSession(req, res, config, state);
-        if (!session) {
-          return;
-        }
         const token = decodeURIComponent(apiTimelineImageMatch[1]);
         const index = Number(apiTimelineImageMatch[2]) || 0;
-        const filePath = resolveTimelineEntryImagePath(runtime, token, index);
+        const filePath = resolveTimelineEntryImagePath(runtime, state, token, index);
         if (!filePath) {
           res.statusCode = 404;
           res.end("not-found");
           return;
         }
+        if (!isValidTimelineEntryImageSignature(config, url, token, index, filePath)) {
+          const session = requireApiSession(req, res, config, state);
+          if (!session) {
+            return;
+          }
+        }
         try {
           const body = await fs.readFile(filePath);
           res.statusCode = 200;
@@ -16104,7 +17442,14 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
 
         approval.resolving = true;
         try {
-          if (approval.resolveClaudeWaiter) {
+          if (approval.resolveMcpWaiter) {
+            approval.resolveMcpWaiter({
+              approved: true,
+              decision: "answered",
+              answers,
+              answerText: reasonText,
+            });
+          } else if (approval.resolveClaudeWaiter) {
             approval.resolveClaudeWaiter({
               permissionDecision: "deny",
               permissionDecisionReason: reasonText,
@@ -16140,8 +17485,10 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
           if (stateChanged) {
             await saveState(config.stateFile, state);
           }
-          console.log(`[claude-question-answer] ${approval.requestKey}`);
-          activateClaudeDesktopIfMac(req);
+          console.log(`[${approval.provider === "mcp" ? "mcp" : "claude"}-question-answer] ${approval.requestKey}`);
+          if (approval.provider === "claude") {
+            activateClaudeDesktopIfMac(req);
+          }
           return writeJson(res, 200, { ok: true });
         } catch (error) {
           approval.resolving = false;
@@ -16725,14 +18072,22 @@ if (url.pathname === "/api/hazbase/logout" && req.method === "POST") {
     }
   };
 
+  let server;
   if (config.webPushEnabled) {
-    return createHttpsServer({
+    server = createHttpsServer({
       cert: readFileSync(config.tlsCertFile, "utf8"),
       key: readFileSync(config.tlsKeyFile, "utf8"),
     }, requestHandler);
+  } else {
+    server = createHttpServer(requestHandler);
   }
-
-  return createHttpServer(requestHandler);
+  // Expose the handler on the server so the remote-pairing relay client can
+  // reuse it: RPC frames arriving over the encrypted relay channel get
+  // wrapped in synthetic req/res objects and dispatched through the SAME
+  // listener LAN HTTP requests use, so authn/authz/cookies/CSRF behave
+  // identically off-LAN.
+  server.requestHandler = requestHandler;
+  return server;
 }
 
 function requestWantsHtml(req) {
@@ -18036,6 +19391,7 @@ function buildConfig(cli) {
   const codexHome = resolvePath(process.env.CODEX_HOME || path.join(os.homedir(), ".codex"));
   const stateFile = resolvePath(process.env.STATE_FILE || path.join(workspaceRoot, ".viveworker-state.json"));
   return {
+    envFile: resolveEnvFile(cli.envFile),
     dryRun: cli.dryRun || truthy(process.env.DRY_RUN),
     once: cli.once,
     codexHome,
@@ -18050,6 +19406,12 @@ function buildConfig(cli) {
     a2aRelayUserId: cleanText(process.env.A2A_RELAY_USER_ID || ""),
     a2aRelaySecret: cleanText(process.env.A2A_RELAY_SECRET || ""),
     a2aRelayRegisterSecret: cleanText(process.env.A2A_RELAY_REGISTER_SECRET || ""),
+    // Remote-pairing relay (PWA off-LAN). Off by default — bridges that
+    // never leave the trusted LAN don't need to open an outbound connection
+    // to the relay. Toggle with REMOTE_PAIRING_ENABLED=true in
+    // ~/.viveworker/remote-pairing.env (or any source loadEnvFile reads).
+    remotePairingEnabled: boolEnv("REMOTE_PAIRING_ENABLED", false),
+    remotePairingRelayUrl: remotePairingRelayUrlFromEnv(),
     // share.viveworker.com — HTML hosting backed by the same A2A credentials.
     // Override for staging / self-hosted deployments via VIVEWORKER_SHARE_URL.
     a2aShareUrl: stripTrailingSlash(
@@ -18688,32 +20050,70 @@ function resolveEnvFile(explicitPath) {
   return path.join(workspaceRoot, "viveworker.env");
 }
 
-function loadEnvFile(filePath) {
-  try {
-    const text = readFileSync(filePath, "utf8");
-    for (const rawLine of text.split(/\r?\n/u)) {
-      const line = rawLine.trim();
-      if (!line || line.startsWith("#")) {
-        continue;
-      }
+function parseEnvText(text) {
+  const output = {};
+  for (const rawLine of String(text || "").split(/\r?\n/u)) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) {
+      continue;
+    }
 
-      const separator = line.indexOf("=");
-      if (separator === -1) {
-        continue;
-      }
+    const separator = line.indexOf("=");
+    if (separator === -1) {
+      continue;
+    }
 
-      const key = line.slice(0, separator).trim();
-      let value = line.slice(separator + 1).trim();
-      if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
-        value = value.slice(1, -1);
-      }
-      process.env[key] = value;
+    const key = line.slice(0, separator).trim();
+    let value = line.slice(separator + 1).trim();
+    if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
+      value = value.slice(1, -1);
     }
+    output[key] = value;
+  }
+  return output;
+}
+
+function loadEnvFile(filePath) {
+  try {
+    Object.assign(process.env, parseEnvText(readFileSync(filePath, "utf8")));
   } catch {
     // Optional env file.
   }
 }
 
+function refreshPairingConfigFromEnvFile(config) {
+  if (!config?.envFile) {
+    return false;
+  }
+
+  let entries;
+  try {
+    entries = parseEnvText(readFileSync(config.envFile, "utf8"));
+  } catch {
+    return false;
+  }
+
+  const nextCode = entries.PAIRING_CODE ?? "";
+  const nextToken = entries.PAIRING_TOKEN ?? "";
+  const nextExpiresAtMs = Number(entries.PAIRING_EXPIRES_AT_MS) || 0;
+  if (
+    config.pairingCode === nextCode &&
+    config.pairingToken === nextToken &&
+    Number(config.pairingExpiresAtMs) === nextExpiresAtMs
+  ) {
+    return false;
+  }
+
+  config.pairingCode = nextCode;
+  config.pairingToken = nextToken;
+  config.pairingExpiresAtMs = nextExpiresAtMs;
+  process.env.PAIRING_CODE = nextCode;
+  process.env.PAIRING_TOKEN = nextToken;
+  process.env.PAIRING_EXPIRES_AT_MS = String(nextExpiresAtMs);
+  console.log(`[pairing] refreshed credentials from ${config.envFile}`);
+  return true;
+}
+
 async function maybeRotateStartupPairingEnv(envFile) {
   if (!truthy(process.env.AUTH_REQUIRED)) {
     return;
@@ -19033,16 +20433,20 @@ function extractRolloutMessageText(content) {
   if (!Array.isArray(content)) {
     return "";
   }
-  return cleanText(
-    content
-      .map((entry) =>
-        isPlainObject(entry) && (entry.type === "input_text" || entry.type === "output_text")
-          ? normalizeTimelineMessageText(entry.text ?? "")
-          : ""
-      )
-      .filter(Boolean)
-      .join("\n")
-  );
+  // The per-entry text is already passed through `normalizeTimelineMessageText`
+  // (which preserves newlines for the markdown renderer). The final wrap used
+  // to be `cleanText`, which collapses every \s+ — newlines included — into
+  // a single space, flattening tables / code fences / lists into one
+  // illegible line. Use a plain trim instead so the structure survives.
+  return content
+    .map((entry) =>
+      isPlainObject(entry) && (entry.type === "input_text" || entry.type === "output_text")
+        ? normalizeTimelineMessageText(entry.text ?? "")
+        : ""
+    )
+    .filter(Boolean)
+    .join("\n")
+    .trim();
 }
 
 function extractTitleOnlyJsonTitleFromRolloutContent(content) {
@@ -19569,21 +20973,68 @@ function isInlineImagePlaceholderText(value) {
   return cleanText(stripInlineImagePlaceholderMarkup(value)) === "" && /<\/?image\b/iu.test(String(value || ""));
 }
 
+function stripCodexUserAttachmentEnvelope(value) {
+  const source = String(value || "");
+  if (!/Files mentioned by the user:/iu.test(source) || !/My request for Codex:/iu.test(source)) {
+    return source;
+  }
+
+  const marker = source.match(/\bMy request for Codex:\s*/iu);
+  if (!marker || marker.index == null) {
+    return source;
+  }
+  return source.slice(marker.index + marker[0].length).trim();
+}
+
 function normalizeTimelineMessageText(value, locale = DEFAULT_LOCALE) {
-  return normalizeLongText(replaceTurnAbortedMarkup(stripInlineImagePlaceholderMarkup(value), locale));
+  return normalizeLongText(
+    replaceTurnAbortedMarkup(
+      stripCodexUserAttachmentEnvelope(stripInlineImagePlaceholderMarkup(value)),
+      locale
+    )
+  );
+}
+
+function extractTimelineImagePaths(value) {
+  const source = String(value || "");
+  if (!/Files mentioned by the user:/iu.test(source)) {
+    return [];
+  }
+
+  const paths = [];
+  for (const match of source.matchAll(/(\/Users\/[^\n\r]+?\.(?:png|jpe?g|webp|gif|heic|heif))(?:\s|$)/giu)) {
+    const filePath = cleanText(match[1] || "");
+    if (filePath) {
+      paths.push(filePath);
+    }
+  }
+  return normalizeTimelineImagePaths(paths);
 }
 
 function normalizeTimelineImagePaths(value) {
   if (!Array.isArray(value)) {
     return [];
   }
-  return value
-    .map((entry) => cleanText(entry || ""))
-    .filter(Boolean);
+  const output = [];
+  const seen = new Set();
+  for (const entry of value) {
+    const normalized = cleanText(entry || "");
+    if (!normalized || seen.has(normalized)) {
+      continue;
+    }
+    seen.add(normalized);
+    output.push(normalized);
+  }
+  return output;
 }
 
 function normalizeNotificationText(value, locale = DEFAULT_LOCALE) {
-  return normalizeLongText(replaceTurnAbortedMarkup(stripNotificationMarkup(value), locale))
+  return normalizeLongText(
+    replaceTurnAbortedMarkup(
+      stripCodexUserAttachmentEnvelope(stripNotificationMarkup(value)),
+      locale
+    )
+  )
     .replace(/\n{2,}/gu, "\n")
     .trim();
 }
@@ -19644,6 +21095,65 @@ function cleanText(value) {
   return String(value || "").replace(/\s+/gu, " ").trim();
 }
 
+function normalizeRemotePairingRelayUrl(value) {
+  const trimmed = cleanText(value);
+  if (!trimmed) {
+    return { ok: true, value: "" };
+  }
+
+  let parsed;
+  try {
+    parsed = new URL(trimmed);
+  } catch {
+    return {
+      ok: false,
+      message: "relayUrl must be a valid URL",
+    };
+  }
+
+  if (parsed.username || parsed.password) {
+    return {
+      ok: false,
+      message: "relayUrl must not include credentials",
+    };
+  }
+
+  if (parsed.protocol === "wss:") {
+    return { ok: true, value: trimmed };
+  }
+
+  if (parsed.protocol === "ws:" && isLoopbackRelayHost(parsed.hostname)) {
+    return { ok: true, value: trimmed };
+  }
+
+  return {
+    ok: false,
+    message: "relayUrl must use wss://; ws:// is allowed only for localhost or loopback development",
+  };
+}
+
+function isLoopbackRelayHost(hostname) {
+  const host = String(hostname || "").toLowerCase().replace(/^\[|\]$/gu, "");
+  return (
+    host === "localhost" ||
+    host.endsWith(".localhost") ||
+    host === "::1" ||
+    /^127(?:\.\d{1,3}){3}$/u.test(host)
+  );
+}
+
+function remotePairingRelayUrlFromEnv() {
+  const raw = process.env.REMOTE_PAIRING_RELAY_URL || "";
+  const result = normalizeRemotePairingRelayUrl(raw);
+  if (result.ok) {
+    return result.value;
+  }
+  if (cleanText(raw)) {
+    console.warn(`[remote-pairing] ignoring REMOTE_PAIRING_RELAY_URL: ${result.message}`);
+  }
+  return "";
+}
+
 function extractTitleOnlyJsonTitle(value) {
   const rawText = String(value ?? "").trim();
   if (!rawText) {
@@ -20068,6 +21578,38 @@ async function main() {
       }
     }
 
+    // --- Remote-pairing relay (PWA off-LAN) ---
+    // Optional. When enabled, the bridge keeps an outbound WebSocket open per
+    // paired phone (`~/.viveworker/remote-pairings.json`) to the remote-pairing
+    // relay (Cloudflare Worker + Durable Object). RPC frames arriving over
+    // those channels are dispatched through the same `requestHandler` LAN HTTP
+    // uses, so cookies / auth / CSRF behave identically off-LAN.
+    //
+    // If disabled (default), the orchestrator returns a dormant handle and
+    // does no I/O. Pairings file changes are auto-reloaded via fs.watch — no
+    // outer loop needed here.
+    if (approvalServer && approvalServer.requestHandler) {
+      try {
+        runtime.remotePairingHandle = await startRemotePairingRelay({
+          enabled: config.remotePairingEnabled,
+          relayUrl: config.remotePairingRelayUrl || undefined,
+          requestListener: approvalServer.requestHandler,
+          logger: console,
+          auditEventSink: recordRemotePairingAudit,
+        });
+        const status = runtime.remotePairingHandle.getStatus();
+        if (status.enabled) {
+          console.log(
+            `[remote-pairing] connected relay=${status.relayUrl} ` +
+            `identity=${status.identityFingerprint} ` +
+            `paired=${status.sessions.length}`
+          );
+        }
+      } catch (err) {
+        console.error(`[remote-pairing] startup failed: ${err?.message}`);
+      }
+    }
+
     let lastA2aEnvCheckAt = 0;
     const A2A_ENV_CHECK_INTERVAL_MS = 30_000; // check every 30 seconds
 
@@ -20154,6 +21696,13 @@ async function main() {
 
     stopRelayPolling();
 
+    if (runtime.remotePairingHandle) {
+      try {
+        runtime.remotePairingHandle.close();
+      } catch {}
+      runtime.remotePairingHandle = null;
+    }
+
     if (runtime.ipcClient) {
       runtime.ipcClient.stop();
     }