From 95a7a04303a9b92e8300676712cdf9300d4c4ea0 Mon Sep 17 00:00:00 2001
From: "rosetta-livekit-bot[bot]"
 <282703043+rosetta-livekit-bot[bot]@users.noreply.github.com>
Date: Fri, 29 May 2026 03:25:34 +0000
Subject: [PATCH] fix(ipc): bound agent session close during shutdown

---
 .changeset/bound-session-close-shutdown.md |  5 +++++
 agents/src/ipc/job_proc_lazy_main.ts       | 24 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/bound-session-close-shutdown.md

diff --git a/.changeset/bound-session-close-shutdown.md b/.changeset/bound-session-close-shutdown.md
new file mode 100644
index 000000000..1677b8008
--- /dev/null
+++ b/.changeset/bound-session-close-shutdown.md
@@ -0,0 +1,5 @@
+---
+'@livekit/agents': patch
+---
+
+Bound AgentSession close during job shutdown so shutdown callbacks still run.
diff --git a/agents/src/ipc/job_proc_lazy_main.ts b/agents/src/ipc/job_proc_lazy_main.ts
index dba451ada..8402a9673 100644
--- a/agents/src/ipc/job_proc_lazy_main.ts
+++ b/agents/src/ipc/job_proc_lazy_main.ts
@@ -15,6 +15,7 @@ import type { InferenceExecutor } from './inference_executor.js';
 import type { IPCMessage } from './message.js';
 
 const ORPHANED_TIMEOUT = 15 * 1000;
+const SESSION_CLOSE_TIMEOUT = 60 * 1000;
 
 const safeSend = (msg: IPCMessage): boolean => {
   try {
@@ -167,7 +168,28 @@ const startJob = (
 
     // Close the primary agent session if it exists
     if (ctx._primaryAgentSession) {
-      await ctx._primaryAgentSession.close();
+      let sessionCloseTimeout: ReturnType<typeof setTimeout> | undefined;
+      const sessionClosePromise = ctx._primaryAgentSession.close();
+      const sessionCloseTimedOut = await Promise.race([
+        sessionClosePromise.then(() => false),
+        new Promise<true>((resolve) => {
+          sessionCloseTimeout = setTimeout(() => resolve(true), SESSION_CLOSE_TIMEOUT);
+        }),
+      ]).finally(() => {
+        if (sessionCloseTimeout) {
+          clearTimeout(sessionCloseTimeout);
+        }
+      });
+
+      if (sessionCloseTimedOut) {
+        void sessionClosePromise.catch((error) =>
+          logger.debug({ error }, 'AgentSession.close() rejected after shutdown timeout'),
+        );
+        logger.error(
+          { timeout: SESSION_CLOSE_TIMEOUT },
+          'AgentSession.close() timed out; proceeding with shutdown so registered callbacks still run.',
+        );
+      }
     }
 
     // Generate and save/upload session report