refactor(agents): drop dead refreshAfterOwnedSessionWrite; rewire test to publish path (#86572)

ubehera · ubehera · commit b06e2b72d0d8 · 2026-06-02T08:44:46.000-06:00
diff --git a/src/agents/embedded-agent-runner/run/attempt.session-lock.test.ts b/src/agents/embedded-agent-runner/run/attempt.session-lock.test.ts
@@ -767,8 +767,13 @@ describe("embedded attempt session lock lifecycle", () => {
 
     await controller.releaseForPrompt();
     await controller.reacquireAfterPrompt();
+    // Post-reacquire owned write: an owned append landing after the prompt
+    // stream's lock reacquisition still publishes through the trust gate (the
+    // fence stays active), so cleanup must not flag it as a takeover. Distinct
+    // from the in-prompt publish path the trust-gate suite below covers.
+    const beforeWrite = readSessionFileFingerprintSync(sessionFile);
     await fs.appendFile(sessionFile, '{"type":"message","id":"provider-error"}\n', "utf8");
-    controller.refreshAfterOwnedSessionWrite();
+    controller.publishOwnedPostMessageWrite(beforeWrite);
 
     const cleanupLock = await controller.acquireForCleanup();
     await cleanupLock.release();
@@ -854,23 +859,6 @@ describe("embedded attempt session lock lifecycle", () => {
     expect(release).toHaveBeenCalledTimes(3);
   });
 
-  it("refreshes the prompt fence after an owned session manager append", async () => {
-    const sessionFile = await createTempSessionFile();
-    const release = vi.fn(async () => {});
-    const acquireSessionWriteLockLocal3 = vi.fn(async () => ({ release }));
-    const controller = await createEmbeddedAttemptSessionLockController({
-      acquireSessionWriteLock: acquireSessionWriteLockLocal3,
-      lockOptions: { ...lockOptions, sessionFile },
-    });
-
-    await controller.releaseForPrompt();
-    await fs.appendFile(sessionFile, '{"type":"message","id":"owned-session-manager"}\n', "utf8");
-    controller.refreshAfterOwnedSessionWrite();
-
-    await expect(controller.withSessionWriteLock(() => "finalize")).resolves.toBe("finalize");
-    expect(controller.hasSessionTakeover()).toBe(false);
-  });
-
   it("allows post-prompt writes after the prompt context publishes an owned transcript write", async () => {
     const sessionFile = await createTempSessionFile();
     const releases: string[] = [];
diff --git a/src/agents/embedded-agent-runner/run/attempt.session-lock.ts b/src/agents/embedded-agent-runner/run/attempt.session-lock.ts
@@ -624,7 +624,6 @@ export class EmbeddedAttemptSessionTakeoverError extends Error {
 export type EmbeddedAttemptSessionLockController = {
   releaseForPrompt(): Promise<void>;
   releaseHeldLockForAbort(): Promise<void>;
-  refreshAfterOwnedSessionWrite(): void;
   publishOwnedPostMessageWrite(beforeWrite: SessionFileFingerprint | undefined): void;
   reacquireAfterPrompt(): Promise<void>;
   waitForSessionEvents(session: unknown): Promise<void>;
@@ -952,12 +951,6 @@ export async function createEmbeddedAttemptSessionLockController(params: {
     async releaseHeldLockForAbort(): Promise<void> {
       await releaseHeldLockWithFence();
     },
-    refreshAfterOwnedSessionWrite(): void {
-      if (fenceActive && !takeoverDetected) {
-        fenceFingerprint = readSessionFileFingerprintSync(params.lockOptions.sessionFile);
-        fenceSnapshot = { fingerprint: fenceFingerprint };
-      }
-    },
     publishOwnedPostMessageWrite(beforeWrite: SessionFileFingerprint | undefined): void {
       // Called synchronously after pi's `sessionManager.appendMessage` →
       // `_persist` → `appendFileSync` from the `onMessagePersisted` callback.
