fix(codex): keep pending compact starts pending

pashpashpash · pashpashpash · commit 4b9b8ce0c065 · 2026-05-24T17:15:16.000-07:00
diff --git a/extensions/codex/src/app-server/compact.test.ts b/extensions/codex/src/app-server/compact.test.ts
@@ -111,7 +111,7 @@ describe("maybeCompactCodexAppServerSession", () => {
     expect(fake.request).toHaveBeenCalledWith("thread/compact/start", { threadId: "thread-1" });
     expect(fake.client.addNotificationHandler).not.toHaveBeenCalled();
     expect(result.ok).toBe(true);
-    expect(result.compacted).toBe(true);
+    expect(result.compacted).toBe(false);
     expect(result.result?.tokensBefore).toBe(123);
     expect(result.result?.tokensAfter).toBeUndefined();
     const details = compactDetails(result);
@@ -176,7 +176,7 @@ describe("maybeCompactCodexAppServerSession", () => {
     });
 
     expect(result.ok).toBe(true);
-    expect(result.compacted).toBe(true);
+    expect(result.compacted).toBe(false);
     expect(result.result?.tokensAfter).toBeUndefined();
     expect(compactDetails(result).tokenUsageSource).toBeUndefined();
     expect(compactDetails(result).signal).toBe("thread/compact/start");
@@ -241,7 +241,7 @@ describe("maybeCompactCodexAppServerSession", () => {
     );
 
     expect(result.ok).toBe(true);
-    expect(result.compacted).toBe(true);
+    expect(result.compacted).toBe(false);
     expect(compactDetails(result)).toMatchObject({
       backend: "codex-app-server",
       threadId: "thread-1",
@@ -551,7 +551,7 @@ describe("maybeCompactCodexAppServerSession", () => {
 
     expect(fake.request).toHaveBeenCalledWith("thread/compact/start", { threadId: "thread-1" });
     expect(result.ok).toBe(true);
-    expect(result.compacted).toBe(true);
+    expect(result.compacted).toBe(false);
     expect(compactDetails(result)).toMatchObject({
       backend: "codex-app-server",
       threadId: "thread-1",
diff --git a/extensions/codex/src/app-server/compact.ts b/extensions/codex/src/app-server/compact.ts
@@ -197,7 +197,7 @@ async function compactCodexNativeThread(
   };
   return {
     ok: true,
-    compacted: true,
+    compacted: false,
     result: {
       summary: "",
       firstKeptEntryId: "",
diff --git a/src/auto-reply/reply/commands-compact.test.ts b/src/auto-reply/reply/commands-compact.test.ts
@@ -350,7 +350,7 @@ describe("handleCompactCommand", () => {
   it("reports started Codex native compaction without incrementing completed compaction state", async () => {
     vi.mocked(compactEmbeddedPiSession).mockResolvedValueOnce({
       ok: true,
-      compacted: true,
+      compacted: false,
       result: {
         summary: "",
         firstKeptEntryId: "",
diff --git a/src/gateway/server.sessions.compaction.test.ts b/src/gateway/server.sessions.compaction.test.ts
@@ -391,6 +391,91 @@ test("sessions.compact without maxLines runs embedded manual compaction for chec
   ws.close();
 });
 
+test("sessions.compact treats Codex native compaction start as pending, not completed", async () => {
+  const { dir, storePath } = await createSessionStoreDir();
+  await fs.writeFile(
+    path.join(dir, "sess-codex.jsonl"),
+    `${JSON.stringify({ role: "user", content: "hello codex" })}\n`,
+    "utf-8",
+  );
+  await writeSessionStore({
+    entries: {
+      main: sessionStoreEntry("sess-codex", {
+        agentHarnessId: "codex",
+        compactionCount: 2,
+        totalTokens: 54_321,
+        totalTokensFresh: true,
+      }),
+    },
+  });
+  embeddedRunMock.compactEmbeddedPiSession.mockResolvedValueOnce({
+    ok: true,
+    compacted: false,
+    result: {
+      summary: "",
+      firstKeptEntryId: "",
+      tokensBefore: 54_321,
+      details: {
+        backend: "codex-app-server",
+        threadId: "thread-1",
+        signal: "thread/compact/start",
+        pending: true,
+      },
+    },
+  });
+
+  const { ws } = await openClient();
+  await rpcReq(ws, "sessions.subscribe", {});
+  const endEventPromise = onceMessage(
+    ws,
+    (message) =>
+      message.type === "event" &&
+      message.event === "session.operation" &&
+      (message.payload as { operation?: unknown; phase?: unknown })?.operation === "compact" &&
+      (message.payload as { operation?: unknown; phase?: unknown })?.phase === "end",
+  );
+
+  const compacted = await rpcReq<{
+    ok: true;
+    key: string;
+    compacted: boolean;
+    result?: { details?: unknown };
+  }>(ws, "sessions.compact", {
+    key: "main",
+  });
+
+  expect(compacted.ok).toBe(true);
+  expect(compacted.payload?.key).toBe("agent:main:main");
+  expect(compacted.payload?.compacted).toBe(false);
+  expect(compacted.payload?.result?.details).toMatchObject({
+    backend: "codex-app-server",
+    threadId: "thread-1",
+    signal: "thread/compact/start",
+    pending: true,
+  });
+  const endEvent = await endEventPromise;
+  expect(endEvent.payload).toMatchObject({
+    operation: "compact",
+    phase: "end",
+    sessionKey: "agent:main:main",
+    completed: false,
+  });
+
+  const store = JSON.parse(await fs.readFile(storePath, "utf-8")) as Record<
+    string,
+    {
+      compactionCount?: number;
+      totalTokens?: number;
+      totalTokensFresh?: boolean;
+    }
+  >;
+  expect(store["agent:main:main"]?.compactionCount).toBe(2);
+  expect(store["agent:main:main"]?.totalTokens).toBe(54_321);
+  expect(store["agent:main:main"]?.totalTokensFresh).toBe(true);
+
+  ws.close();
+});
+
 test("sessions.patch preserves nested model ids under provider overrides", async () => {
   const dir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-gw-sessions-nested-"));
   const storePath = path.join(dir, "sessions.json");
