codex-mobile-re 0.1.136 → 0.1.138

package/dist/index.html

@@ -36,8 +36,8 @@
     <link rel="preload" as="font" type="font/woff2" href="/fonts/ibm-plex-sans-400.woff2" crossorigin />
     <link rel="preload" as="font" type="font/woff2" href="/fonts/ibm-plex-mono-400.woff2" crossorigin />
     <title>Codex Web</title>
-    <script type="module" crossorigin src="/assets/index-ChD_mFyW.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CuSbagu4.css">
+    <script type="module" crossorigin src="/assets/index-B7NhUyvj.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CKSFHnPK.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/sw.js

@@ -1,26 +1,49 @@
-const CACHE_NAME = 'codexweb-shell-v2'
+// round-183：把缓存名绑到构建产物上，并让安装过程不会因为一次瞬时失败而卡死。
+//
+// 背景（线上现象）：重部署后有些标签页会「坏一阵子，清掉应用缓存就好了」。
+// 两条叠加的原因：
+//   1) CACHE_NAME 写死成固定字符串（旧值以 `v2` 结尾）⇒ sw.js 的字节在两次构建之间**完全
+//      相同**，浏览器不会判定 SW 需要更新，所以既不会重新 install，也不会在
+//      activate 里清掉旧缓存 ⇒ 旧 shell 与旧 chunk 可以一直留着（旧标签页请求
+//      已下线的 chunk 时，networkFirstStatic 还会从缓存里把旧文件喂回去，
+//      于是整页继续跑旧构建，而服务端早已是新版本）。
+//   2) install 里用了 cache.addAll：任一资源失败就整体 reject ⇒ 新 SW 装不上、
+//      旧 SW 继续服务。重部署瞬间最容易踩这个。
+//
+// 修法：BUILD_ID 由构建期注入（见 vite.config.ts 的 codex-sw-version 插件），
+// 每次产物变化 ⇒ sw.js 字节变化 ⇒ 走标准更新流程 ⇒ activate 清掉所有非当前
+// 版本的缓存；install 改成逐个 add 且各自吞错。
+const BUILD_ID = 'cc0efc82b5'
+const CACHE_NAME = `codexweb-shell-${BUILD_ID}`
 const APP_SHELL_PATHS = ['/', '/manifest.webmanifest']
 const STATIC_DESTINATIONS = new Set(['document', 'script', 'style', 'image', 'font'])
 const BYPASS_PREFIXES = ['/codex-api/', '/codex-local-image', '/codex-local-file', '/codex-local-browse/', '/codex-local-edit/']
 
 self.addEventListener('install', (event) => {
   event.waitUntil(
-    caches.open(CACHE_NAME).then((cache) => cache.addAll(APP_SHELL_PATHS)),
+    (async () => {
+      const cache = await caches.open(CACHE_NAME)
+      // 逐个装入：单个资源失败不该让新版本装不上（旧行为是 addAll 整体 reject）。
+      await Promise.all(
+        APP_SHELL_PATHS.map((path) => cache.add(path).catch(() => undefined)),
+      )
+    })(),
   )
   self.skipWaiting()
 })
 
 self.addEventListener('activate', (event) => {
   event.waitUntil(
-    caches.keys().then((keys) =>
-      Promise.all(
+    (async () => {
+      const keys = await caches.keys()
+      await Promise.all(
         keys
           .filter((key) => key !== CACHE_NAME)
           .map((key) => caches.delete(key)),
-      ),
-    ),
+      )
+      await self.clients.claim()
+    })(),
   )
-  self.clients.claim()
 })
 
 self.addEventListener('fetch', (event) => {
@@ -50,9 +73,12 @@ async function networkFirstNavigation(request) {
   const cache = await caches.open(CACHE_NAME)
   try {
     const response = await fetch(request)
-    cache.put('/', response.clone())
+    if (response.ok) {
+      cache.put('/', response.clone())
+    }
     return response
   } catch {
+    // 仅真正的离线才回退缓存；此时缓存一定是本构建写入的（缓存名带 BUILD_ID）。
     return (await cache.match('/')) || Response.error()
   }
 }

package/dist-cli/index.js

@@ -7,7 +7,7 @@ import { readFile as readFile20, stat as stat19, writeFile as writeFile20 } from
 import { homedir as homedir11, networkInterfaces } from "os";
 import { isAbsolute as isAbsolute13, join as join32, resolve as resolve8 } from "path";
 import { spawn as spawn9 } from "child_process";
-import { createInterface as createInterface2 } from "readline/promises";
+import { createInterface as createInterface3 } from "readline/promises";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { dirname as dirname12 } from "path";
 import { get as httpsGet } from "https";
@@ -10712,10 +10712,36 @@ import { readFile as readFile10, stat as stat11 } from "fs/promises";
 // src/server/bridge/session.ts
 import { mkdir as mkdir8, readFile as readFile9, rename as rename2, rm as rm6, stat as stat9, writeFile as writeFile8 } from "fs/promises";
 import { dirname as dirname4, isAbsolute as isAbsolute4, join as join17 } from "path";
+
+// src/server/bridge/sessionLogScan.ts
+import { createReadStream as createReadStream3 } from "fs";
+import { createInterface } from "readline";
+var SESSION_LOG_READ_CHUNK_BYTES = 64 * 1024;
+async function* iterateSessionLogLines(sessionPath) {
+  const stream = createReadStream3(sessionPath, {
+    encoding: "utf8",
+    highWaterMark: SESSION_LOG_READ_CHUNK_BYTES
+  });
+  const reader = createInterface({ input: stream, crlfDelay: Infinity });
+  try {
+    for await (const line of reader) yield line;
+  } finally {
+    reader.close();
+    stream.destroy();
+  }
+}
+async function readSessionLogFirstLine(sessionPath) {
+  for await (const line of iterateSessionLogLines(sessionPath)) return line;
+  return "";
+}
+
+// src/server/bridge/session.ts
 var SESSION_SKILL_INPUT_CACHE_LIMIT = 64;
 var sessionSkillInputCache = /* @__PURE__ */ new Map();
+var sessionSkillInputScanInFlight = /* @__PURE__ */ new Map();
 var SESSION_LOG_RECOVERY_CACHE_LIMIT = 64;
 var sessionLogRecoveryCache = /* @__PURE__ */ new Map();
+var sessionLogRecoveryScanInFlight = /* @__PURE__ */ new Map();
 function rememberSessionLogRecovery(sessionPath, size, mtimeMs, recoverable) {
   sessionLogRecoveryCache.delete(sessionPath);
   sessionLogRecoveryCache.set(sessionPath, { size, mtimeMs, recoverable });
@@ -10733,10 +10759,10 @@ function parseSessionSkillText(value) {
   if (!name || !path) return null;
   return { name, path };
 }
-function buildSessionSkillInputsByTurn(sessionLogRaw) {
+async function buildSessionSkillInputsByTurn(lines) {
   let currentTurnId = "";
   const skillsByTurnId = /* @__PURE__ */ new Map();
-  for (const line of sessionLogRaw.split("\n")) {
+  for await (const line of lines) {
     if (!line.trim()) continue;
     let row = null;
     try {
@@ -10780,18 +10806,30 @@ async function readCachedSessionSkillInputsByTurn(sessionPath) {
   if (cached && cached.size === sessionStat.size && cached.mtimeMs === sessionStat.mtimeMs) {
     return cached.skillsByTurnId;
   }
-  const sessionLogRaw = await readFile9(sessionPath, "utf8");
-  const skillsByTurnId = buildSessionSkillInputsByTurn(sessionLogRaw);
-  sessionSkillInputCache.set(sessionPath, {
-    size: sessionStat.size,
-    mtimeMs: sessionStat.mtimeMs,
-    skillsByTurnId
-  });
-  if (sessionSkillInputCache.size > SESSION_SKILL_INPUT_CACHE_LIMIT) {
-    const oldestKey = sessionSkillInputCache.keys().next().value;
-    if (oldestKey) sessionSkillInputCache.delete(oldestKey);
+  const scanKey = `${sessionPath}\0${sessionStat.size}\0${sessionStat.mtimeMs}`;
+  const inFlight = sessionSkillInputScanInFlight.get(scanKey);
+  if (inFlight) return await inFlight;
+  const scan = (async () => {
+    const skillsByTurnId = await buildSessionSkillInputsByTurn(iterateSessionLogLines(sessionPath));
+    sessionSkillInputCache.delete(sessionPath);
+    sessionSkillInputCache.set(sessionPath, {
+      size: sessionStat.size,
+      mtimeMs: sessionStat.mtimeMs,
+      skillsByTurnId
+    });
+    while (sessionSkillInputCache.size > SESSION_SKILL_INPUT_CACHE_LIMIT) {
+      const oldestKey = sessionSkillInputCache.keys().next().value;
+      if (!oldestKey) break;
+      sessionSkillInputCache.delete(oldestKey);
+    }
+    return skillsByTurnId;
+  })();
+  sessionSkillInputScanInFlight.set(scanKey, scan);
+  try {
+    return await scan;
+  } finally {
+    sessionSkillInputScanInFlight.delete(scanKey);
   }
-  return skillsByTurnId;
 }
 function mergeSessionSkillInputsIntoTurnsFromMap(turns, skillsByTurnId) {
   const turnIds = /* @__PURE__ */ new Set();
@@ -10988,7 +11026,7 @@ function parseApplyPatchInput(input) {
   }
   return changes;
 }
-function buildSessionFileChangeFallback(threadReadPayload, sessionLogRaw) {
+async function buildSessionFileChangeFallback(threadReadPayload, lines) {
   const payload = asRecord(threadReadPayload);
   const thread = asRecord(payload?.thread);
   const turns = Array.isArray(thread?.turns) ? thread.turns : [];
@@ -11002,7 +11040,7 @@ function buildSessionFileChangeFallback(threadReadPayload, sessionLogRaw) {
   }
   const collectedByTurnId = /* @__PURE__ */ new Map();
   let currentTurnId = "";
-  for (const line of sessionLogRaw.split("\n")) {
+  for await (const line of lines) {
     if (!line.trim()) continue;
     let row = null;
     try {
@@ -11082,12 +11120,12 @@ function isRecoverableToolPayload(payload) {
   if (payload.type === "function_call") return name === "exec_command" || name === "shell_command";
   return payload.type === "custom_tool_call" && name === "apply_patch";
 }
-function buildSessionItemOrder(sessionLogRaw, turnIds) {
+async function buildSessionItemOrder(lines, turnIds) {
   let currentTurnId = "";
   const orderByTurnId = /* @__PURE__ */ new Map();
   const callIdToCommand = /* @__PURE__ */ new Map();
   let sawRecoverableToolRow = false;
-  for (const line of sessionLogRaw.split("\n")) {
+  for await (const line of lines) {
     if (!line.trim()) continue;
     let row = null;
     try {
@@ -11201,10 +11239,10 @@ function extractFilePathsFromCommand(cmd, cwd) {
   }
   return [...new Set(paths)];
 }
-function collectFileChangesForTurns(sessionLogRaw, turnIdsToRevert, cwd) {
+async function collectFileChangesForTurns(lines, turnIdsToRevert, cwd) {
   let currentTurnId = "";
   const infoByTurnId = /* @__PURE__ */ new Map();
-  for (const line of sessionLogRaw.split("\n")) {
+  for await (const line of lines) {
     if (!line.trim()) continue;
     let row = null;
     try {
@@ -11703,9 +11741,18 @@ async function mergeSessionCommandsIntoTurnsFromPath(turns, sessionPath) {
   if (cached && cached.size === sessionStat.size && cached.mtimeMs === sessionStat.mtimeMs && !cached.recoverable) {
     return turns;
   }
-  const sessionLogRaw = await readFile9(sessionPath, "utf8");
-  const { orderByTurnId, sawRecoverableToolRow } = buildSessionItemOrder(sessionLogRaw, turnIds);
-  rememberSessionLogRecovery(sessionPath, sessionStat.size, sessionStat.mtimeMs, sawRecoverableToolRow);
+  const scanKey = `${sessionPath}\0${sessionStat.size}\0${sessionStat.mtimeMs}\0${[...turnIds].sort().join(",")}`;
+  let scan = sessionLogRecoveryScanInFlight.get(scanKey);
+  if (!scan) {
+    scan = (async () => {
+      const { orderByTurnId: orderByTurnId2, sawRecoverableToolRow } = await buildSessionItemOrder(iterateSessionLogLines(sessionPath), turnIds);
+      rememberSessionLogRecovery(sessionPath, sessionStat.size, sessionStat.mtimeMs, sawRecoverableToolRow);
+      return orderByTurnId2;
+    })();
+    sessionLogRecoveryScanInFlight.set(scanKey, scan);
+    void scan.catch(() => void 0).finally(() => sessionLogRecoveryScanInFlight.delete(scanKey));
+  }
+  const orderByTurnId = await scan;
   return mergeSessionCommandsIntoTurnsFromOrder(turns, orderByTurnId);
 }
 async function mergeSessionCommandsIntoThreadResult(result) {
@@ -12001,8 +12048,8 @@ function handleThreadHttpRequest(req, res, url, deps) {
         return true;
       }
       try {
-        const sessionLogRaw = await readFile10(sessionPath, "utf8");
-        setJson2(res, 200, { data: buildSessionFileChangeFallback(threadReadResult, sessionLogRaw) });
+        const data = await buildSessionFileChangeFallback(threadReadResult, iterateSessionLogLines(sessionPath));
+        setJson2(res, 200, { data });
       } catch {
         setJson2(res, 200, { data: [] });
       }
@@ -12415,10 +12462,10 @@ async function handleTelegramHttpRequest(req, res, url, deps) {
 }
 
 // src/server/bridge/threadPreferencesRoutes.ts
-import { createReadStream as createReadStream3 } from "fs";
+import { createReadStream as createReadStream4 } from "fs";
 import { readFile as readFile13, stat as stat12, writeFile as writeFile12 } from "fs/promises";
 import { join as join21 } from "path";
-import { createInterface } from "readline";
+import { createInterface as createInterface2 } from "readline";
 var MAX_THREAD_TITLES = 500;
 var MAX_REASONING_MESSAGES_PER_THREAD = 20;
 var MAX_TURN_DURATIONS_PER_THREAD = 200;
@@ -12692,8 +12739,8 @@ function getSessionIndexFileSignature(stats) {
 }
 async function parseThreadTitlesFromSessionIndex(sessionIndexPath) {
   const latestById = /* @__PURE__ */ new Map();
-  const input = createReadStream3(sessionIndexPath, { encoding: "utf8" });
-  const lines = createInterface({
+  const input = createReadStream4(sessionIndexPath, { encoding: "utf8" });
+  const lines = createInterface2({
     input,
     crlfDelay: Infinity
   });
@@ -12908,7 +12955,7 @@ data: ${JSON.stringify({ ok: true })}
 // src/server/bridge/projectZip.ts
 import { randomUUID as randomUUID3 } from "crypto";
 import { existsSync as existsSync8 } from "fs";
-import { mkdir as mkdir10, readFile as readFile15, realpath as realpath3, utimes, writeFile as writeFile14 } from "fs/promises";
+import { mkdir as mkdir10, realpath as realpath3, utimes, writeFile as writeFile14 } from "fs/promises";
 import { basename as basename7, dirname as dirname5, extname as extname3, isAbsolute as isAbsolute7, join as join23, relative as relative3, resolve as resolve4, sep as sep3 } from "path";
 
 // src/server/bridge/importedSessions.ts
@@ -13495,13 +13542,13 @@ async function collectProjectChatZipEntries(projectRoot) {
   for (const root of roots) {
     for await (const sessionPath of walkFiles(root.disk)) {
       if (extname3(sessionPath) !== ".jsonl") continue;
-      let raw = "";
+      let metaLine = "";
       try {
-        raw = await readFile15(sessionPath, "utf8");
+        metaLine = await readSessionLogFirstLine(sessionPath);
       } catch {
         continue;
       }
-      const sessionCwd = readSessionMetaCwd(raw);
+      const sessionCwd = readSessionMetaCwd(metaLine);
       if (!sessionCwd) continue;
       let canonicalSessionCwd = "";
       try {
@@ -13512,7 +13559,7 @@ async function collectProjectChatZipEntries(projectRoot) {
       if (!isSameOrDescendantPath(canonicalSessionCwd, canonicalProjectRoot)) continue;
       const rel = relative3(root.disk, sessionPath).split(sep3).join("/");
       const zipPath = `${root.zip}/${rel}`;
-      const sessionId = readSessionMetaId(raw);
+      const sessionId = readSessionMetaId(metaLine);
       const stateMetadata = sessionId ? stateDbThreadMetadata.get(sessionId) : void 0;
       const title = readNonEmptyString(stateMetadata?.title) || (sessionId ? readNonEmptyString(threadTitles.titles[sessionId]) : "");
       if (title) exportedTitles[zipPath] = title;
@@ -15521,6 +15568,7 @@ var MERGEABLE_ITEM_TYPES = /* @__PURE__ */ new Set([
   "commandExecution",
   "fileChange"
 ]);
+var THREAD_READ_SNAPSHOT_LIMIT = 8;
 var AppServerProcess = class {
   constructor() {
     this.process = null;
@@ -15722,7 +15770,13 @@ var AppServerProcess = class {
     return buffer.slice(-limit);
   }
   storeThreadReadSnapshot(threadId, snapshot) {
+    this.lastThreadReadSnapshotByThreadId.delete(threadId);
     this.lastThreadReadSnapshotByThreadId.set(threadId, snapshot);
+    while (this.lastThreadReadSnapshotByThreadId.size > THREAD_READ_SNAPSHOT_LIMIT) {
+      const oldestThreadId = this.lastThreadReadSnapshotByThreadId.keys().next().value;
+      if (!oldestThreadId) break;
+      this.lastThreadReadSnapshotByThreadId.delete(oldestThreadId);
+    }
     this.invalidateBoundedThreadTurnPageCache(threadId);
   }
   getLastThreadReadSnapshot(threadId) {
@@ -16959,14 +17013,17 @@ function createCodexBridgeMiddleware() {
             setJson(res, 200, { reverted: 0, errors: [], message: "No turns to revert" });
             return;
           }
-          let sessionLogRaw;
+          let turnInfos;
           try {
-            sessionLogRaw = await readFile19(sessionPath, "utf8");
+            turnInfos = await collectFileChangesForTurns(
+              iterateSessionLogLines(sessionPath),
+              turnIdsToRevert,
+              cwd
+            );
           } catch {
             setJson(res, 200, { reverted: 0, errors: ["Could not read session log"], message: "Session log unreadable" });
             return;
           }
-          const turnInfos = collectFileChangesForTurns(sessionLogRaw, turnIdsToRevert, cwd);
           if (turnInfos.size === 0) {
             setJson(res, 200, { changed: 0, errors: [], message: action === "redo" ? "No file changes to redo" : "No file changes to revert" });
             return;
@@ -17458,6 +17515,57 @@ function createAuthSession(password) {
 
 // src/server/httpServer.ts
 import { WebSocketServer } from "ws";
+
+// src/server/bridge/wsHeartbeat.ts
+var WS_HEARTBEAT_INTERVAL_MS = 25e3;
+function attachWebSocketHeartbeat(socket, options = {}) {
+  const intervalMs = options.intervalMs ?? WS_HEARTBEAT_INTERVAL_MS;
+  const onDead = options.onDead ?? (() => {
+    try {
+      socket.terminate();
+    } catch {
+    }
+  });
+  let alive = true;
+  let stopped = false;
+  const handlePong = () => {
+    alive = true;
+  };
+  const stop = () => {
+    if (stopped) return;
+    stopped = true;
+    clearInterval(timer);
+    socket.off?.("pong", handlePong);
+    socket.off?.("close", stop);
+    socket.off?.("error", stop);
+  };
+  const timer = setInterval(() => {
+    if (stopped) return;
+    if (!alive) {
+      stop();
+      onDead();
+      return;
+    }
+    alive = false;
+    try {
+      socket.ping();
+    } catch {
+      stop();
+      onDead();
+    }
+  }, intervalMs);
+  const unrefable = timer;
+  if (typeof unrefable.unref === "function") unrefable.unref();
+  socket.on("pong", handlePong);
+  socket.on("close", stop);
+  socket.on("error", stop);
+  return stop;
+}
+function attachHeartbeatToWebSocket(ws) {
+  return attachWebSocketHeartbeat(ws);
+}
+
+// src/server/httpServer.ts
 var __dirname = dirname11(fileURLToPath(import.meta.url));
 var distDir = join31(__dirname, "..", "dist");
 var spaEntryFile = join31(distDir, "index.html");
@@ -17723,6 +17831,7 @@ function createServer(options = {}) {
         });
       });
       wss.on("connection", (ws) => {
+        attachHeartbeatToWebSocket(ws);
         ws.send(JSON.stringify({ method: "ready", params: { ok: true }, atIso: (/* @__PURE__ */ new Date()).toISOString() }));
         const unsubscribe = bridge.subscribeNotifications((notification) => {
           if (ws.readyState !== 1) return;
@@ -17878,7 +17987,7 @@ async function shouldInstallCloudflaredInteractively() {
     console.warn("\n[cloudflared] cloudflared is missing and terminal is non-interactive, skipping install.");
     return false;
   }
-  const prompt = createInterface2({ input: process.stdin, output: process.stdout });
+  const prompt = createInterface3({ input: process.stdin, output: process.stdout });
   try {
     const answer = await prompt.question("cloudflared is not installed. Install it now to ~/.local/bin? [y/N] ");
     const normalized = answer.trim().toLowerCase();