diff --git a/src/agents/cli-runner/prepare.test.ts b/src/agents/cli-runner/prepare.test.ts
index 23e5c0af263..0db7d20d299 100644
--- a/src/agents/cli-runner/prepare.test.ts
+++ b/src/agents/cli-runner/prepare.test.ts
@@ -1091,7 +1091,7 @@ describe("shouldSkipLocalCliCredentialEpoch", () => {
   });
 
   it("passes current turn kind into bundle MCP loopback env", async () => {
-    const { dir, sessionFile } = createSessionFile();
+    const { dir } = createTranscriptStateFixture();
     try {
       const getActiveMcpLoopbackRuntime = vi.fn(() => ({
         port: 31783,
@@ -1126,7 +1126,6 @@ describe("shouldSkipLocalCliCredentialEpoch", () => {
       const context = await prepareCliRunContext({
         sessionId: "session-test",
         sessionKey: "agent:main:telegram:group:chat123",
-        sessionFile,
         workspaceDir: dir,
         prompt: "latest ask",
         provider: "native-cli",
diff --git a/src/commands/agent.test.ts b/src/commands/agent.test.ts
index 3f56814fec0..bf0c6f80317 100644
--- a/src/commands/agent.test.ts
+++ b/src/commands/agent.test.ts
@@ -476,14 +476,13 @@ describe("agentCommand", () => {
 
   it("installs a local gateway request scope for embedded agent dispatch", async () => {
     await withTempHome(async (home) => {
-      const store = path.join(home, "sessions.json");
-      mockConfig(home, store);
+      mockConfig(home);
       const { getPluginRuntimeGatewayRequestScope } =
         await import("../plugins/runtime/gateway-request-scope.js");
       vi.mocked(attemptExecutionRuntime.runAgentAttempt).mockImplementationOnce(async () => {
         const scope = getPluginRuntimeGatewayRequestScope();
         expect(scope?.context?.getRuntimeConfig()).toMatchObject({
-          session: { store },
+          session: { mainKey: "main" },
         });
         return createDefaultAgentResult();
       });
diff --git a/src/cron/isolated-agent/delivery-dispatch.double-announce.test.ts b/src/cron/isolated-agent/delivery-dispatch.double-announce.test.ts
index 6046ebff9c7..caca6b5a440 100644
--- a/src/cron/isolated-agent/delivery-dispatch.double-announce.test.ts
+++ b/src/cron/isolated-agent/delivery-dispatch.double-announce.test.ts
@@ -26,7 +26,6 @@ const {
 } = vi.hoisted(() => ({
   appendAssistantMessageToSessionTranscriptMock: vi.fn().mockResolvedValue({
     ok: true,
-    sessionFile: "session.jsonl",
     messageId: "mirror-message",
   }),
   countActiveDescendantRunsMock: vi.fn().mockReturnValue(0),
@@ -314,7 +313,6 @@ describe("dispatchCronDelivery — double-announce guard", () => {
     vi.mocked(ensureOutboundSessionEntry).mockResolvedValue(undefined);
     vi.mocked(appendAssistantMessageToSessionTranscript).mockResolvedValue({
       ok: true,
-      sessionFile: "session.jsonl",
       messageId: "mirror-message",
     });
     maybeApplyTtsToPayloadMock.mockReset().mockImplementation(async (params) => params.payload);