fix(e2e): detect same-size log rotation

vincentkoc · vincentkoc · commit 6883351085c3 · 2026-06-02T07:11:57.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Release/CI/E2E: reset incremental log readers when watched log files rotate without shrinking, so same-size replacements do not hide new readiness or RPC lines.
 - Talk: preserve explicit `null` payloads on controller-created turn and output-audio lifecycle events.
 - Agents/TUI: keep local custom provider runs from loading plugin runtime and auth alias metadata when plugins are disabled.
 - Agents/TUI: restore in-flight TUI run switch-back behavior, keep no-policy native hook fallback available, guard vanished workspaces, and keep lightweight isolated subagents lightweight.
diff --git a/scripts/e2e/lib/incremental-line-reader.mjs b/scripts/e2e/lib/incremental-line-reader.mjs
@@ -14,12 +14,20 @@ function readSlice(filePath, start, length) {
   }
 }
 
+function resolveFileIdentity(stats) {
+  if (Number.isSafeInteger(stats.dev) && Number.isSafeInteger(stats.ino) && stats.ino !== 0) {
+    return `${stats.dev}:${stats.ino}`;
+  }
+  return Number.isFinite(stats.birthtimeMs) ? `birth:${stats.birthtimeMs}` : undefined;
+}
+
 export function resolvePositiveInteger(value, fallback) {
   return Number.isSafeInteger(value) && value > 0 ? value : fallback;
 }
 
 export function createIncrementalLineReader(filePath, options = {}) {
   const maxReadBytes = resolvePositiveInteger(options.maxReadBytes, 256 * 1024);
+  let fileIdentity;
   let offset = 0;
   let pending = "";
 
@@ -35,6 +43,18 @@ export function createIncrementalLineReader(filePath, options = {}) {
       }
 
       let reset = false;
+      const nextFileIdentity = resolveFileIdentity(stats);
+      if (
+        fileIdentity !== undefined &&
+        nextFileIdentity !== undefined &&
+        fileIdentity !== nextFileIdentity
+      ) {
+        offset = 0;
+        pending = "";
+        reset = true;
+      }
+      fileIdentity = nextFileIdentity;
+
       if (stats.size < offset) {
         offset = 0;
         pending = "";
diff --git a/test/scripts/codex-media-path-client.test.ts b/test/scripts/codex-media-path-client.test.ts
@@ -19,6 +19,14 @@ function jsonl(value: unknown): string {
   return `${JSON.stringify(value)}\n`;
 }
 
+function padJsonlToLength(value: Record<string, unknown>, length: number): string {
+  const base = jsonl({ ...value, pad: "" });
+  if (base.length > length) {
+    throw new Error(`cannot pad JSONL down from ${base.length} to ${length}`);
+  }
+  return jsonl({ ...value, pad: "x".repeat(length - base.length) });
+}
+
 function runWriteConfig(root: string, env: Record<string, string> = {}) {
   return spawnSync(process.execPath, [writeConfigPath], {
     encoding: "utf8",
@@ -132,4 +140,21 @@ describe("codex media path JSONL tailer", () => {
     writeFileSync(logPath, jsonl({ method: "turn/start" }));
     expect(tailer.read()).toEqual([{ method: "turn/start" }]);
   });
+
+  it("resets request history when a rotated app-server log keeps the same size", () => {
+    const logPath = path.join(makeTempRoot(), "app-server.jsonl");
+    const tailer = createJsonlRequestTailer(logPath, { maxReadBytes: 1024, historyLimit: 10 });
+    const oldText = jsonl({ method: "initialize", pad: "x".repeat(64) });
+    const replacementText = padJsonlToLength({ method: "turn/start" }, oldText.length);
+    const replacement = JSON.parse(replacementText) as Record<string, unknown>;
+
+    expect(replacementText.length).toBe(oldText.length);
+    writeFileSync(logPath, oldText);
+    expect(tailer.read()).toEqual([{ method: "initialize", pad: "x".repeat(64) }]);
+
+    rmSync(logPath, { force: true });
+    writeFileSync(logPath, replacementText);
+
+    expect(tailer.read()).toEqual([replacement]);
+  });
 });
diff --git a/test/scripts/config-reload-log-scanner.test.ts b/test/scripts/config-reload-log-scanner.test.ts
@@ -95,4 +95,28 @@ describe("config reload log scanner", () => {
     expect(result.reloadLines).toEqual([]);
     expect(result.restartLines).toEqual(["config change requires gateway restart: new.path"]);
   });
+
+  it("resets accumulated matches when a rotated log keeps the same size", () => {
+    const logPath = path.join(makeTempRoot(), "gateway.log");
+    const scanner = createConfigReloadLogScanner(logPath, {
+      maxReadBytes: 1024,
+      tailLineLimit: 4,
+    });
+    const oldText = "config change detected; evaluating reload: old.path with enough padding\n";
+    const restartLine = "config change requires gateway restart: new.path";
+    const restartText = `${restartLine}${" ".repeat(oldText.length - restartLine.length - 1)}\n`;
+
+    expect(Buffer.byteLength(restartText)).toBe(Buffer.byteLength(oldText));
+    writeFileSync(logPath, oldText);
+    expect(scanner.scan().reloadLines).toEqual([
+      "config change detected; evaluating reload: old.path with enough padding",
+    ]);
+
+    rmSync(logPath, { force: true });
+    writeFileSync(logPath, restartText);
+
+    const result = scanner.scan();
+    expect(result.reloadLines).toEqual([]);
+    expect(result.restartLines).toEqual([restartText.replace(/\n$/u, "")]);
+  });
 });
