@livekit/agents 1.1.0-dev.0 → 1.2.0

package/dist/voice/agent_activity.test.cjs

@@ -0,0 +1,135 @@
+"use strict";
+var import_heap_js = require("heap-js");
+var import_vitest = require("vitest");
+var import_utils = require("../utils.cjs");
+var import_agent_activity = require("./agent_activity.cjs");
+var import_speech_handle = require("./speech_handle.cjs");
+import_vitest.vi.mock("./agent.js", () => {
+  class Agent {
+  }
+  class AgentTask extends Agent {
+  }
+  class StopResponse {
+  }
+  return {
+    Agent,
+    AgentTask,
+    StopResponse,
+    _getActivityTaskInfo: () => null,
+    _setActivityTaskInfo: () => {
+    },
+    functionCallStorage: {
+      getStore: () => void 0,
+      enterWith: () => {
+      },
+      run: (_, fn) => fn()
+    },
+    speechHandleStorage: {
+      getStore: () => void 0,
+      enterWith: () => {
+      }
+    }
+  };
+});
+import_vitest.vi.mock("../version.js", () => ({ version: "0.0.0-test" }));
+async function raceTimeout(promise, ms) {
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve("timeout"), ms);
+  });
+  return Promise.race([promise.then(() => "resolved"), timeout]).finally(
+    () => clearTimeout(timer)
+  );
+}
+function buildMainTaskRunner() {
+  const q_updated = new import_utils.Future();
+  const speechQueue = new import_heap_js.Heap((a, b) => b[0] - a[0] || a[1] - b[1]);
+  const fakeActivity = {
+    q_updated,
+    speechQueue,
+    _currentSpeech: void 0,
+    _schedulingPaused: false,
+    getDrainPendingSpeechTasks: () => [],
+    logger: {
+      info: () => {
+      },
+      debug: () => {
+      },
+      warn: () => {
+      },
+      error: () => {
+      }
+    }
+  };
+  const mainTask = import_agent_activity.AgentActivity.prototype.mainTask;
+  return {
+    fakeActivity,
+    mainTask: mainTask.bind(fakeActivity),
+    speechQueue,
+    q_updated
+  };
+}
+(0, import_vitest.describe)("AgentActivity - mainTask", () => {
+  (0, import_vitest.it)("should recover when speech handle is interrupted after authorization", async () => {
+    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();
+    const handle = import_speech_handle.SpeechHandle.create({ allowInterruptions: true });
+    speechQueue.push([import_speech_handle.SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);
+    handle._markScheduled();
+    q_updated.resolve();
+    const ac = new AbortController();
+    const mainTaskPromise = mainTask(ac.signal);
+    await new Promise((r) => setTimeout(r, 50));
+    handle.interrupt();
+    await new Promise((r) => setTimeout(r, 50));
+    fakeActivity._schedulingPaused = true;
+    fakeActivity.q_updated = new import_utils.Future();
+    fakeActivity.q_updated.resolve();
+    ac.abort();
+    const result = await raceTimeout(mainTaskPromise, 2e3);
+    (0, import_vitest.expect)(result).toBe("resolved");
+  });
+  (0, import_vitest.it)("should process next queued handle after an interrupted one", async () => {
+    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();
+    const handleA = import_speech_handle.SpeechHandle.create({ allowInterruptions: true });
+    const handleB = import_speech_handle.SpeechHandle.create({ allowInterruptions: true });
+    speechQueue.push([import_speech_handle.SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handleA]);
+    handleA._markScheduled();
+    speechQueue.push([import_speech_handle.SpeechHandle.SPEECH_PRIORITY_NORMAL, 2, handleB]);
+    handleB._markScheduled();
+    q_updated.resolve();
+    const ac = new AbortController();
+    const mainTaskPromise = mainTask(ac.signal);
+    await new Promise((r) => setTimeout(r, 50));
+    handleA.interrupt();
+    await new Promise((r) => setTimeout(r, 50));
+    try {
+      handleB._markGenerationDone();
+    } catch {
+    }
+    await new Promise((r) => setTimeout(r, 50));
+    fakeActivity._schedulingPaused = true;
+    fakeActivity.q_updated = new import_utils.Future();
+    fakeActivity.q_updated.resolve();
+    ac.abort();
+    const result = await raceTimeout(mainTaskPromise, 2e3);
+    (0, import_vitest.expect)(result).toBe("resolved");
+  });
+  (0, import_vitest.it)("should skip handles that were interrupted before being popped", async () => {
+    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();
+    const handle = import_speech_handle.SpeechHandle.create({ allowInterruptions: true });
+    handle.interrupt();
+    speechQueue.push([import_speech_handle.SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);
+    handle._markScheduled();
+    q_updated.resolve();
+    const ac = new AbortController();
+    const mainTaskPromise = mainTask(ac.signal);
+    await new Promise((r) => setTimeout(r, 50));
+    fakeActivity._schedulingPaused = true;
+    fakeActivity.q_updated = new import_utils.Future();
+    fakeActivity.q_updated.resolve();
+    ac.abort();
+    const result = await raceTimeout(mainTaskPromise, 2e3);
+    (0, import_vitest.expect)(result).toBe("resolved");
+  });
+});
+//# sourceMappingURL=agent_activity.test.cjs.map

package/dist/voice/agent_activity.test.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/voice/agent_activity.test.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2025 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\n\n/**\n * Regression tests for mainTask speech handle processing.\n *\n * When a speech handle is interrupted after _authorizeGeneration() but before the\n * reply task calls _markGenerationDone(), mainTask hangs on _waitForGeneration()\n * indefinitely. All subsequent speech handles queue behind it and the agent becomes\n * unresponsive.\n *\n * Fix: race _waitForGeneration() against the interrupt future via waitIfNotInterrupted().\n *\n * Related: #1124, #1089, #836\n */\nimport { Heap } from 'heap-js';\nimport { describe, expect, it, vi } from 'vitest';\nimport { Future } from '../utils.js';\nimport { AgentActivity } from './agent_activity.js';\nimport { SpeechHandle } from './speech_handle.js';\n\n// Break circular dependency: agent_activity.ts → agent.js → beta/workflows/task_group.ts\nvi.mock('./agent.js', () => {\n  class Agent {}\n  class AgentTask extends Agent {}\n  class StopResponse {}\n  return {\n    Agent,\n    AgentTask,\n    StopResponse,\n    _getActivityTaskInfo: () => null,\n    _setActivityTaskInfo: () => {},\n    functionCallStorage: {\n      getStore: () => undefined,\n      enterWith: () => {},\n      run: (_: unknown, fn: () => unknown) => fn(),\n    },\n    speechHandleStorage: {\n      getStore: () => undefined,\n      enterWith: () => {},\n    },\n  };\n});\n\nvi.mock('../version.js', () => ({ version: '0.0.0-test' }));\n\nasync function raceTimeout(promise: Promise<unknown>, ms: number): Promise<'resolved' | 'timeout'> {\n  let timer: ReturnType<typeof setTimeout>;\n  const timeout = new Promise<'timeout'>((resolve) => {\n    timer = setTimeout(() => resolve('timeout'), ms);\n  });\n  return Promise.race([promise.then(() => 'resolved' as const), timeout]).finally(() =>\n    clearTimeout(timer),\n  );\n}\n\n/**\n * Build a minimal stand-in with just enough state for mainTask to run.\n *\n * mainTask accesses: q_updated, speechQueue, _currentSpeech, _schedulingPaused,\n * getDrainPendingSpeechTasks(), and logger. We provide stubs for all of these,\n * then bind the real AgentActivity.prototype.mainTask to this object.\n */\nfunction buildMainTaskRunner() {\n  const q_updated = new Future<void>();\n  type HeapItem = [number, number, SpeechHandle];\n  const speechQueue = new Heap<HeapItem>((a: HeapItem, b: HeapItem) => b[0] - a[0] || a[1] - b[1]);\n\n  const fakeActivity = {\n    q_updated,\n    speechQueue,\n    _currentSpeech: undefined as SpeechHandle | undefined,\n    _schedulingPaused: false,\n    getDrainPendingSpeechTasks: () => [],\n    logger: {\n      info: () => {},\n      debug: () => {},\n      warn: () => {},\n      error: () => {},\n    },\n  };\n\n  const mainTask = (AgentActivity.prototype as Record<string, unknown>).mainTask as (\n    signal: AbortSignal,\n  ) => Promise<void>;\n\n  return {\n    fakeActivity,\n    mainTask: mainTask.bind(fakeActivity),\n    speechQueue,\n    q_updated,\n  };\n}\n\ndescribe('AgentActivity - mainTask', () => {\n  it('should recover when speech handle is interrupted after authorization', async () => {\n    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();\n\n    const handle = SpeechHandle.create({ allowInterruptions: true });\n\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);\n    handle._markScheduled();\n    q_updated.resolve();\n\n    const ac = new AbortController();\n    const mainTaskPromise = mainTask(ac.signal);\n\n    // Give mainTask time to pop the handle and call _authorizeGeneration\n    await new Promise((r) => setTimeout(r, 50));\n\n    // Interrupt while waiting for generation\n    handle.interrupt();\n\n    // Let mainTask react to the interrupt, then signal exit\n    await new Promise((r) => setTimeout(r, 50));\n    fakeActivity._schedulingPaused = true;\n    fakeActivity.q_updated = new Future();\n    fakeActivity.q_updated.resolve();\n    ac.abort();\n\n    const result = await raceTimeout(mainTaskPromise, 2000);\n    expect(result).toBe('resolved');\n  });\n\n  it('should process next queued handle after an interrupted one', async () => {\n    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();\n\n    const handleA = SpeechHandle.create({ allowInterruptions: true });\n    const handleB = SpeechHandle.create({ allowInterruptions: true });\n\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handleA]);\n    handleA._markScheduled();\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 2, handleB]);\n    handleB._markScheduled();\n    q_updated.resolve();\n\n    const ac = new AbortController();\n    const mainTaskPromise = mainTask(ac.signal);\n\n    // Wait for mainTask to pick up handle A\n    await new Promise((r) => setTimeout(r, 50));\n\n    // Interrupt handle A\n    handleA.interrupt();\n\n    // Wait for mainTask to move to handle B and authorize it\n    await new Promise((r) => setTimeout(r, 50));\n\n    // Resolve handle B's generation (simulating normal reply task completion).\n    // If mainTask is stuck on handle A (bug), handle B was never authorized and this\n    // throws — we catch it and let the timeout assert the real failure.\n    try {\n      handleB._markGenerationDone();\n    } catch {\n      // Expected when fix is absent: handle B has no active generation\n    }\n\n    // Let mainTask finish\n    await new Promise((r) => setTimeout(r, 50));\n    fakeActivity._schedulingPaused = true;\n    fakeActivity.q_updated = new Future();\n    fakeActivity.q_updated.resolve();\n    ac.abort();\n\n    const result = await raceTimeout(mainTaskPromise, 2000);\n    expect(result).toBe('resolved');\n  });\n\n  it('should skip handles that were interrupted before being popped', async () => {\n    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();\n\n    const handle = SpeechHandle.create({ allowInterruptions: true });\n\n    // Interrupt before mainTask ever sees it\n    handle.interrupt();\n\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);\n    handle._markScheduled();\n    q_updated.resolve();\n\n    const ac = new AbortController();\n    const mainTaskPromise = mainTask(ac.signal);\n\n    await new Promise((r) => setTimeout(r, 50));\n    fakeActivity._schedulingPaused = true;\n    fakeActivity.q_updated = new Future();\n    fakeActivity.q_updated.resolve();\n    ac.abort();\n\n    const result = await raceTimeout(mainTaskPromise, 2000);\n    expect(result).toBe('resolved');\n  });\n});\n"],"mappings":";AAgBA,qBAAqB;AACrB,oBAAyC;AACzC,mBAAuB;AACvB,4BAA8B;AAC9B,2BAA6B;AAG7B,iBAAG,KAAK,cAAc,MAAM;AAAA,EAC1B,MAAM,MAAM;AAAA,EAAC;AAAA,EACb,MAAM,kBAAkB,MAAM;AAAA,EAAC;AAAA,EAC/B,MAAM,aAAa;AAAA,EAAC;AACpB,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,sBAAsB,MAAM;AAAA,IAC5B,sBAAsB,MAAM;AAAA,IAAC;AAAA,IAC7B,qBAAqB;AAAA,MACnB,UAAU,MAAM;AAAA,MAChB,WAAW,MAAM;AAAA,MAAC;AAAA,MAClB,KAAK,CAAC,GAAY,OAAsB,GAAG;AAAA,IAC7C;AAAA,IACA,qBAAqB;AAAA,MACnB,UAAU,MAAM;AAAA,MAChB,WAAW,MAAM;AAAA,MAAC;AAAA,IACpB;AAAA,EACF;AACF,CAAC;AAED,iBAAG,KAAK,iBAAiB,OAAO,EAAE,SAAS,aAAa,EAAE;AAE1D,eAAe,YAAY,SAA2B,IAA6C;AACjG,MAAI;AACJ,QAAM,UAAU,IAAI,QAAmB,CAAC,YAAY;AAClD,YAAQ,WAAW,MAAM,QAAQ,SAAS,GAAG,EAAE;AAAA,EACjD,CAAC;AACD,SAAO,QAAQ,KAAK,CAAC,QAAQ,KAAK,MAAM,UAAmB,GAAG,OAAO,CAAC,EAAE;AAAA,IAAQ,MAC9E,aAAa,KAAK;AAAA,EACpB;AACF;AASA,SAAS,sBAAsB;AAC7B,QAAM,YAAY,IAAI,oBAAa;AAEnC,QAAM,cAAc,IAAI,oBAAe,CAAC,GAAa,MAAgB,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAE/F,QAAM,eAAe;AAAA,IACnB;AAAA,IACA;AAAA,IACA,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,IACnB,4BAA4B,MAAM,CAAC;AAAA,IACnC,QAAQ;AAAA,MACN,MAAM,MAAM;AAAA,MAAC;AAAA,MACb,OAAO,MAAM;AAAA,MAAC;AAAA,MACd,MAAM,MAAM;AAAA,MAAC;AAAA,MACb,OAAO,MAAM;AAAA,MAAC;AAAA,IAChB;AAAA,EACF;AAEA,QAAM,WAAY,oCAAc,UAAsC;AAItE,SAAO;AAAA,IACL;AAAA,IACA,UAAU,SAAS,KAAK,YAAY;AAAA,IACpC;AAAA,IACA;AAAA,EACF;AACF;AAAA,IAEA,wBAAS,4BAA4B,MAAM;AACzC,wBAAG,wEAAwE,YAAY;AACrF,UAAM,EAAE,cAAc,UAAU,aAAa,UAAU,IAAI,oBAAoB;AAE/E,UAAM,SAAS,kCAAa,OAAO,EAAE,oBAAoB,KAAK,CAAC;AAE/D,gBAAY,KAAK,CAAC,kCAAa,wBAAwB,GAAG,MAAM,CAAC;AACjE,WAAO,eAAe;AACtB,cAAU,QAAQ;AAElB,UAAM,KAAK,IAAI,gBAAgB;AAC/B,UAAM,kBAAkB,SAAS,GAAG,MAAM;AAG1C,UAAM,IAAI,QAAQ,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAG1C,WAAO,UAAU;AAGjB,UAAM,IAAI,QAAQ,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAC1C,iBAAa,oBAAoB;AACjC,iBAAa,YAAY,IAAI,oBAAO;AACpC,iBAAa,UAAU,QAAQ;AAC/B,OAAG,MAAM;AAET,UAAM,SAAS,MAAM,YAAY,iBAAiB,GAAI;AACtD,8BAAO,MAAM,EAAE,KAAK,UAAU;AAAA,EAChC,CAAC;AAED,wBAAG,8DAA8D,YAAY;AAC3E,UAAM,EAAE,cAAc,UAAU,aAAa,UAAU,IAAI,oBAAoB;AAE/E,UAAM,UAAU,kCAAa,OAAO,EAAE,oBAAoB,KAAK,CAAC;AAChE,UAAM,UAAU,kCAAa,OAAO,EAAE,oBAAoB,KAAK,CAAC;AAEhE,gBAAY,KAAK,CAAC,kCAAa,wBAAwB,GAAG,OAAO,CAAC;AAClE,YAAQ,eAAe;AACvB,gBAAY,KAAK,CAAC,kCAAa,wBAAwB,GAAG,OAAO,CAAC;AAClE,YAAQ,eAAe;AACvB,cAAU,QAAQ;AAElB,UAAM,KAAK,IAAI,gBAAgB;AAC/B,UAAM,kBAAkB,SAAS,GAAG,MAAM;AAG1C,UAAM,IAAI,QAAQ,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAG1C,YAAQ,UAAU;AAGlB,UAAM,IAAI,QAAQ,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAK1C,QAAI;AACF,cAAQ,oBAAoB;AAAA,IAC9B,QAAQ;AAAA,IAER;AAGA,UAAM,IAAI,QAAQ,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAC1C,iBAAa,oBAAoB;AACjC,iBAAa,YAAY,IAAI,oBAAO;AACpC,iBAAa,UAAU,QAAQ;AAC/B,OAAG,MAAM;AAET,UAAM,SAAS,MAAM,YAAY,iBAAiB,GAAI;AACtD,8BAAO,MAAM,EAAE,KAAK,UAAU;AAAA,EAChC,CAAC;AAED,wBAAG,iEAAiE,YAAY;AAC9E,UAAM,EAAE,cAAc,UAAU,aAAa,UAAU,IAAI,oBAAoB;AAE/E,UAAM,SAAS,kCAAa,OAAO,EAAE,oBAAoB,KAAK,CAAC;AAG/D,WAAO,UAAU;AAEjB,gBAAY,KAAK,CAAC,kCAAa,wBAAwB,GAAG,MAAM,CAAC;AACjE,WAAO,eAAe;AACtB,cAAU,QAAQ;AAElB,UAAM,KAAK,IAAI,gBAAgB;AAC/B,UAAM,kBAAkB,SAAS,GAAG,MAAM;AAE1C,UAAM,IAAI,QAAQ,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAC1C,iBAAa,oBAAoB;AACjC,iBAAa,YAAY,IAAI,oBAAO;AACpC,iBAAa,UAAU,QAAQ;AAC/B,OAAG,MAAM;AAET,UAAM,SAAS,MAAM,YAAY,iBAAiB,GAAI;AACtD,8BAAO,MAAM,EAAE,KAAK,UAAU;AAAA,EAChC,CAAC;AACH,CAAC;","names":[]}

package/dist/voice/agent_activity.test.js

@@ -0,0 +1,134 @@
+import { Heap } from "heap-js";
+import { describe, expect, it, vi } from "vitest";
+import { Future } from "../utils.js";
+import { AgentActivity } from "./agent_activity.js";
+import { SpeechHandle } from "./speech_handle.js";
+vi.mock("./agent.js", () => {
+  class Agent {
+  }
+  class AgentTask extends Agent {
+  }
+  class StopResponse {
+  }
+  return {
+    Agent,
+    AgentTask,
+    StopResponse,
+    _getActivityTaskInfo: () => null,
+    _setActivityTaskInfo: () => {
+    },
+    functionCallStorage: {
+      getStore: () => void 0,
+      enterWith: () => {
+      },
+      run: (_, fn) => fn()
+    },
+    speechHandleStorage: {
+      getStore: () => void 0,
+      enterWith: () => {
+      }
+    }
+  };
+});
+vi.mock("../version.js", () => ({ version: "0.0.0-test" }));
+async function raceTimeout(promise, ms) {
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve("timeout"), ms);
+  });
+  return Promise.race([promise.then(() => "resolved"), timeout]).finally(
+    () => clearTimeout(timer)
+  );
+}
+function buildMainTaskRunner() {
+  const q_updated = new Future();
+  const speechQueue = new Heap((a, b) => b[0] - a[0] || a[1] - b[1]);
+  const fakeActivity = {
+    q_updated,
+    speechQueue,
+    _currentSpeech: void 0,
+    _schedulingPaused: false,
+    getDrainPendingSpeechTasks: () => [],
+    logger: {
+      info: () => {
+      },
+      debug: () => {
+      },
+      warn: () => {
+      },
+      error: () => {
+      }
+    }
+  };
+  const mainTask = AgentActivity.prototype.mainTask;
+  return {
+    fakeActivity,
+    mainTask: mainTask.bind(fakeActivity),
+    speechQueue,
+    q_updated
+  };
+}
+describe("AgentActivity - mainTask", () => {
+  it("should recover when speech handle is interrupted after authorization", async () => {
+    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();
+    const handle = SpeechHandle.create({ allowInterruptions: true });
+    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);
+    handle._markScheduled();
+    q_updated.resolve();
+    const ac = new AbortController();
+    const mainTaskPromise = mainTask(ac.signal);
+    await new Promise((r) => setTimeout(r, 50));
+    handle.interrupt();
+    await new Promise((r) => setTimeout(r, 50));
+    fakeActivity._schedulingPaused = true;
+    fakeActivity.q_updated = new Future();
+    fakeActivity.q_updated.resolve();
+    ac.abort();
+    const result = await raceTimeout(mainTaskPromise, 2e3);
+    expect(result).toBe("resolved");
+  });
+  it("should process next queued handle after an interrupted one", async () => {
+    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();
+    const handleA = SpeechHandle.create({ allowInterruptions: true });
+    const handleB = SpeechHandle.create({ allowInterruptions: true });
+    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handleA]);
+    handleA._markScheduled();
+    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 2, handleB]);
+    handleB._markScheduled();
+    q_updated.resolve();
+    const ac = new AbortController();
+    const mainTaskPromise = mainTask(ac.signal);
+    await new Promise((r) => setTimeout(r, 50));
+    handleA.interrupt();
+    await new Promise((r) => setTimeout(r, 50));
+    try {
+      handleB._markGenerationDone();
+    } catch {
+    }
+    await new Promise((r) => setTimeout(r, 50));
+    fakeActivity._schedulingPaused = true;
+    fakeActivity.q_updated = new Future();
+    fakeActivity.q_updated.resolve();
+    ac.abort();
+    const result = await raceTimeout(mainTaskPromise, 2e3);
+    expect(result).toBe("resolved");
+  });
+  it("should skip handles that were interrupted before being popped", async () => {
+    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();
+    const handle = SpeechHandle.create({ allowInterruptions: true });
+    handle.interrupt();
+    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);
+    handle._markScheduled();
+    q_updated.resolve();
+    const ac = new AbortController();
+    const mainTaskPromise = mainTask(ac.signal);
+    await new Promise((r) => setTimeout(r, 50));
+    fakeActivity._schedulingPaused = true;
+    fakeActivity.q_updated = new Future();
+    fakeActivity.q_updated.resolve();
+    ac.abort();
+    const result = await raceTimeout(mainTaskPromise, 2e3);
+    expect(result).toBe("resolved");
+  });
+});
+//# sourceMappingURL=agent_activity.test.js.map

package/dist/voice/agent_activity.test.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/voice/agent_activity.test.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2025 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\n\n/**\n * Regression tests for mainTask speech handle processing.\n *\n * When a speech handle is interrupted after _authorizeGeneration() but before the\n * reply task calls _markGenerationDone(), mainTask hangs on _waitForGeneration()\n * indefinitely. All subsequent speech handles queue behind it and the agent becomes\n * unresponsive.\n *\n * Fix: race _waitForGeneration() against the interrupt future via waitIfNotInterrupted().\n *\n * Related: #1124, #1089, #836\n */\nimport { Heap } from 'heap-js';\nimport { describe, expect, it, vi } from 'vitest';\nimport { Future } from '../utils.js';\nimport { AgentActivity } from './agent_activity.js';\nimport { SpeechHandle } from './speech_handle.js';\n\n// Break circular dependency: agent_activity.ts → agent.js → beta/workflows/task_group.ts\nvi.mock('./agent.js', () => {\n  class Agent {}\n  class AgentTask extends Agent {}\n  class StopResponse {}\n  return {\n    Agent,\n    AgentTask,\n    StopResponse,\n    _getActivityTaskInfo: () => null,\n    _setActivityTaskInfo: () => {},\n    functionCallStorage: {\n      getStore: () => undefined,\n      enterWith: () => {},\n      run: (_: unknown, fn: () => unknown) => fn(),\n    },\n    speechHandleStorage: {\n      getStore: () => undefined,\n      enterWith: () => {},\n    },\n  };\n});\n\nvi.mock('../version.js', () => ({ version: '0.0.0-test' }));\n\nasync function raceTimeout(promise: Promise<unknown>, ms: number): Promise<'resolved' | 'timeout'> {\n  let timer: ReturnType<typeof setTimeout>;\n  const timeout = new Promise<'timeout'>((resolve) => {\n    timer = setTimeout(() => resolve('timeout'), ms);\n  });\n  return Promise.race([promise.then(() => 'resolved' as const), timeout]).finally(() =>\n    clearTimeout(timer),\n  );\n}\n\n/**\n * Build a minimal stand-in with just enough state for mainTask to run.\n *\n * mainTask accesses: q_updated, speechQueue, _currentSpeech, _schedulingPaused,\n * getDrainPendingSpeechTasks(), and logger. We provide stubs for all of these,\n * then bind the real AgentActivity.prototype.mainTask to this object.\n */\nfunction buildMainTaskRunner() {\n  const q_updated = new Future<void>();\n  type HeapItem = [number, number, SpeechHandle];\n  const speechQueue = new Heap<HeapItem>((a: HeapItem, b: HeapItem) => b[0] - a[0] || a[1] - b[1]);\n\n  const fakeActivity = {\n    q_updated,\n    speechQueue,\n    _currentSpeech: undefined as SpeechHandle | undefined,\n    _schedulingPaused: false,\n    getDrainPendingSpeechTasks: () => [],\n    logger: {\n      info: () => {},\n      debug: () => {},\n      warn: () => {},\n      error: () => {},\n    },\n  };\n\n  const mainTask = (AgentActivity.prototype as Record<string, unknown>).mainTask as (\n    signal: AbortSignal,\n  ) => Promise<void>;\n\n  return {\n    fakeActivity,\n    mainTask: mainTask.bind(fakeActivity),\n    speechQueue,\n    q_updated,\n  };\n}\n\ndescribe('AgentActivity - mainTask', () => {\n  it('should recover when speech handle is interrupted after authorization', async () => {\n    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();\n\n    const handle = SpeechHandle.create({ allowInterruptions: true });\n\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);\n    handle._markScheduled();\n    q_updated.resolve();\n\n    const ac = new AbortController();\n    const mainTaskPromise = mainTask(ac.signal);\n\n    // Give mainTask time to pop the handle and call _authorizeGeneration\n    await new Promise((r) => setTimeout(r, 50));\n\n    // Interrupt while waiting for generation\n    handle.interrupt();\n\n    // Let mainTask react to the interrupt, then signal exit\n    await new Promise((r) => setTimeout(r, 50));\n    fakeActivity._schedulingPaused = true;\n    fakeActivity.q_updated = new Future();\n    fakeActivity.q_updated.resolve();\n    ac.abort();\n\n    const result = await raceTimeout(mainTaskPromise, 2000);\n    expect(result).toBe('resolved');\n  });\n\n  it('should process next queued handle after an interrupted one', async () => {\n    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();\n\n    const handleA = SpeechHandle.create({ allowInterruptions: true });\n    const handleB = SpeechHandle.create({ allowInterruptions: true });\n\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handleA]);\n    handleA._markScheduled();\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 2, handleB]);\n    handleB._markScheduled();\n    q_updated.resolve();\n\n    const ac = new AbortController();\n    const mainTaskPromise = mainTask(ac.signal);\n\n    // Wait for mainTask to pick up handle A\n    await new Promise((r) => setTimeout(r, 50));\n\n    // Interrupt handle A\n    handleA.interrupt();\n\n    // Wait for mainTask to move to handle B and authorize it\n    await new Promise((r) => setTimeout(r, 50));\n\n    // Resolve handle B's generation (simulating normal reply task completion).\n    // If mainTask is stuck on handle A (bug), handle B was never authorized and this\n    // throws — we catch it and let the timeout assert the real failure.\n    try {\n      handleB._markGenerationDone();\n    } catch {\n      // Expected when fix is absent: handle B has no active generation\n    }\n\n    // Let mainTask finish\n    await new Promise((r) => setTimeout(r, 50));\n    fakeActivity._schedulingPaused = true;\n    fakeActivity.q_updated = new Future();\n    fakeActivity.q_updated.resolve();\n    ac.abort();\n\n    const result = await raceTimeout(mainTaskPromise, 2000);\n    expect(result).toBe('resolved');\n  });\n\n  it('should skip handles that were interrupted before being popped', async () => {\n    const { fakeActivity, mainTask, speechQueue, q_updated } = buildMainTaskRunner();\n\n    const handle = SpeechHandle.create({ allowInterruptions: true });\n\n    // Interrupt before mainTask ever sees it\n    handle.interrupt();\n\n    speechQueue.push([SpeechHandle.SPEECH_PRIORITY_NORMAL, 1, handle]);\n    handle._markScheduled();\n    q_updated.resolve();\n\n    const ac = new AbortController();\n    const mainTaskPromise = mainTask(ac.signal);\n\n    await new Promise((r) => setTimeout(r, 50));\n    fakeActivity._schedulingPaused = true;\n    fakeActivity.q_updated = new Future();\n    fakeActivity.q_updated.resolve();\n    ac.abort();\n\n    const result = await raceTimeout(mainTaskPromise, 2000);\n    expect(result).toBe('resolved');\n  });\n});\n"],"mappings":"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","names":[]}

package/dist/voice/agent_session.cjs

@@ -19,7 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var agent_session_exports = {};
 __export(agent_session_exports, {
   AgentSession: () => AgentSession,
-  defaultSessionOptions: () => defaultSessionOptions
+  defaultAgentSessionOptions: () => defaultAgentSessionOptions
 });
 module.exports = __toCommonJS(agent_session_exports);
 var import_mutex = require("@livekit/mutex");
@@ -34,17 +34,17 @@ var import_telemetry = require("../telemetry/index.cjs");
 var import_types = require("../types.cjs");
 var import_utils = require("../utils.cjs");
 var import_agent_activity = require("./agent_activity.cjs");
-var import_client_events = require("./client_events.cjs");
 var import_events = require("./events.cjs");
 var import_io = require("./io.cjs");
 var import_recorder_io = require("./recorder_io/index.cjs");
+var import_remote_session = require("./remote_session.cjs");
 var import_room_io = require("./room_io/index.cjs");
 var import_run_result = require("./testing/run_result.cjs");
 var import_utils2 = require("./turn_config/utils.cjs");
 var import_utils3 = require("./utils.cjs");
-const defaultSessionOptions = {
+const defaultAgentSessionOptions = {
   maxToolSteps: 3,
-  preemptiveGeneration: false,
+  preemptiveGeneration: true,
   userAwayTimeout: 15,
   aecWarmupDuration: 3e3,
   turnHandling: {},
@@ -56,14 +56,16 @@ class AgentSession extends import_node_events.EventEmitter {
   llm;
   tts;
   turnDetection;
+  /** @deprecated use {@link sessionOptions } instead */
   options;
+  sessionOptions;
   activityLock = new import_mutex.Mutex();
   agent;
   activity;
   nextActivity;
   updateActivityTask;
   started = false;
-  clientEventsHandler;
+  sessionHost;
   _chatCtx;
   _userData;
   _userState = "listening";
@@ -78,10 +80,10 @@ class AgentSession extends import_node_events.EventEmitter {
   // Unrecoverable error counts, reset after agent speaking
   llmErrorCounts = 0;
   ttsErrorCounts = 0;
-  interruptionDetectionErrorCounts = 0;
   sessionSpan;
   agentSpeakingSpan;
   _interruptionDetection;
+  /** @internal */
   _usageCollector = new import_model_usage.ModelUsageCollector();
   /** @internal */
   _roomIO;
@@ -103,10 +105,10 @@ class AgentSession extends import_node_events.EventEmitter {
   _userSpeakingSpan;
   logger = (0, import_log.log)();
   constructor(options) {
-    var _a, _b, _c;
+    var _a;
     super();
-    const opts = (0, import_utils2.migrateLegacyOptions)(options);
-    const { vad, stt, llm, tts, userData, connOptions, options: sessionOptions } = opts;
+    const { agentSessionOptions: opts, legacyVoiceOptions } = (0, import_utils2.migrateLegacyOptions)(options);
+    const { vad, stt, llm, tts, userData, connOptions, ...resolvedSessionOptions } = opts;
     this._connOptions = {
       sttConnOptions: { ...import_types.DEFAULT_API_CONNECT_OPTIONS, ...connOptions == null ? void 0 : connOptions.sttConnOptions },
       llmConnOptions: { ...import_types.DEFAULT_API_CONNECT_OPTIONS, ...connOptions == null ? void 0 : connOptions.llmConnOptions },
@@ -129,23 +131,21 @@ class AgentSession extends import_node_events.EventEmitter {
     } else {
       this.tts = tts;
     }
-    this.turnDetection = (_a = sessionOptions == null ? void 0 : sessionOptions.turnHandling) == null ? void 0 : _a.turnDetection;
-    this._interruptionDetection = (_c = (_b = sessionOptions == null ? void 0 : sessionOptions.turnHandling) == null ? void 0 : _b.interruption) == null ? void 0 : _c.mode;
+    this.turnDetection = resolvedSessionOptions.turnHandling.turnDetection;
+    this._interruptionDetection = (_a = resolvedSessionOptions.turnHandling.interruption) == null ? void 0 : _a.mode;
     this._userData = userData;
     this._input = new import_io.AgentInput(this.onAudioInputChanged);
     this._output = new import_io.AgentOutput(this.onAudioOutputChanged, this.onTextOutputChanged);
     this._chatCtx = import_chat_context.ChatContext.empty();
-    this.options = opts.options;
-    this._aecWarmupRemaining = this.options.aecWarmupDuration ?? 0;
+    this.sessionOptions = resolvedSessionOptions;
+    this.options = legacyVoiceOptions;
+    this._aecWarmupRemaining = this.sessionOptions.aecWarmupDuration ?? 0;
     this._onUserInputTranscribed = this._onUserInputTranscribed.bind(this);
     this.on(import_events.AgentSessionEventTypes.UserInputTranscribed, this._onUserInputTranscribed);
   }
   emit(event, ...args) {
     const eventData = args[0];
     this._recordedEvents.push(eventData);
-    if (event === import_events.AgentSessionEventTypes.MetricsCollected) {
-      this._usageCollector.collect(eventData.metrics);
-    }
     return super.emit(event, ...args);
   }
   get input() {
@@ -177,7 +177,7 @@ class AgentSession extends import_node_events.EventEmitter {
     return { modelUsage: this._usageCollector.flatten().map(import_model_usage.filterZeroValues) };
   }
   get useTtsAlignedTranscript() {
-    return this.options.useTtsAlignedTranscript;
+    return this.sessionOptions.useTtsAlignedTranscript;
   }
   set userData(value) {
     this._userData = value;
@@ -216,9 +216,11 @@ class AgentSession extends import_node_events.EventEmitter {
         outputOptions
       });
       this._roomIO.start();
-      this.clientEventsHandler = new import_client_events.ClientEventsHandler(this, this._roomIO);
+      const transport = new import_remote_session.RoomSessionTransport(room, this._roomIO);
+      this.sessionHost = new import_remote_session.SessionHost(transport);
+      this.sessionHost.registerSession(this);
       if ((inputOptions == null ? void 0 : inputOptions.textEnabled) !== false) {
-        this.clientEventsHandler.registerTextInput(
+        this.sessionHost.registerTextInput(
           (inputOptions == null ? void 0 : inputOptions.textInputCallback) ?? import_room_io.DEFAULT_TEXT_INPUT_CALLBACK
         );
       }
@@ -252,8 +254,8 @@ class AgentSession extends import_node_events.EventEmitter {
     }
     tasks.push(this._updateActivity(this.agent, { waitOnEnter: false }));
     await Promise.allSettled(tasks);
-    if (this.clientEventsHandler) {
-      await this.clientEventsHandler.start();
+    if (this.sessionHost) {
+      await this.sessionHost.start();
     }
     this.logger.debug(
       `using audio io: ${this.input.audio ? "`" + this.input.audio.constructor.name + "`" : "(none)"} -> \`AgentSession\` -> ${this.output.audio ? "`" + this.output.audio.constructor.name + "`" : "(none)"}`
@@ -554,7 +556,9 @@ class AgentSession extends import_node_events.EventEmitter {
     if (this.closingTask) {
       return;
     }
-    this.closeImpl(reason, error, drain);
+    this.closingTask = this.closeImpl(reason, error, drain).finally(() => {
+      this.closingTask = null;
+    });
   }
   /** @internal */
   _onError(error) {
@@ -572,12 +576,10 @@ class AgentSession extends import_node_events.EventEmitter {
         return;
       }
     } else if (error.type === "interruption_detection_error") {
-      this.interruptionDetectionErrorCounts += 1;
-      if (this.interruptionDetectionErrorCounts <= this._connOptions.maxUnrecoverableErrors) {
-        return;
-      }
+      this.logger.error(error.toString());
+      return;
     }
-    this.logger.error(error, "AgentSession is closing due to unrecoverable error");
+    this.logger.error(error, "AgentSession is closing due to an unrecoverable error");
     this.closingTask = (async () => {
       await this.closeImpl(import_events.CloseReason.ERROR, error);
     })().then(() => {
@@ -602,7 +604,6 @@ class AgentSession extends import_node_events.EventEmitter {
     if (state === "speaking") {
       this.llmErrorCounts = 0;
       this.ttsErrorCounts = 0;
-      this.interruptionDetectionErrorCounts = 0;
       if (this.agentSpeakingSpan === void 0) {
         this.agentSpeakingSpan = import_telemetry.tracer.startSpan({
           name: "agent_speaking",
@@ -638,7 +639,7 @@ class AgentSession extends import_node_events.EventEmitter {
     );
   }
   /** @internal */
-  _updateUserState(state, lastSpeakingTime) {
+  _updateUserState(state, options) {
     var _a;
     if (this._userState === state) {
       return;
@@ -646,15 +647,15 @@ class AgentSession extends import_node_events.EventEmitter {
     if (state === "speaking" && this._userSpeakingSpan === void 0) {
       this._userSpeakingSpan = import_telemetry.tracer.startSpan({
         name: "user_speaking",
-        context: this.rootSpanContext,
-        startTime: lastSpeakingTime
+        context: (options == null ? void 0 : options.otelContext) ?? this.rootSpanContext,
+        startTime: options == null ? void 0 : options.lastSpeakingTime
       });
       const linked = (_a = this._roomIO) == null ? void 0 : _a.linkedParticipant;
       if (linked) {
         (0, import_utils3.setParticipantSpanAttributes)(this._userSpeakingSpan, linked);
       }
     } else if (this._userSpeakingSpan !== void 0) {
-      this._userSpeakingSpan.end(lastSpeakingTime);
+      this._userSpeakingSpan.end(options == null ? void 0 : options.lastSpeakingTime);
       this._userSpeakingSpan = void 0;
     }
     const oldState = this._userState;
@@ -684,7 +685,7 @@ class AgentSession extends import_node_events.EventEmitter {
   }
   _setUserAwayTimer() {
     this._cancelUserAwayTimer();
-    if (this.options.userAwayTimeout === null || this.options.userAwayTimeout === void 0) {
+    if (this.sessionOptions.userAwayTimeout === null || this.sessionOptions.userAwayTimeout === void 0) {
       return;
     }
     if (this._roomIO && !this._roomIO.isParticipantAvailable) {
@@ -693,7 +694,7 @@ class AgentSession extends import_node_events.EventEmitter {
     this.userAwayTimer = setTimeout(() => {
       this.logger.debug("User away timeout triggered");
       this._updateUserState("away");
-    }, this.options.userAwayTimeout * 1e3);
+    }, this.sessionOptions.userAwayTimeout * 1e3);
   }
   _cancelUserAwayTimer() {
     if (this.userAwayTimer !== null) {
@@ -758,8 +759,8 @@ class AgentSession extends import_node_events.EventEmitter {
     this.input.audio = null;
     this.output.audio = null;
     this.output.transcription = null;
-    await ((_b = this.clientEventsHandler) == null ? void 0 : _b.close());
-    this.clientEventsHandler = void 0;
+    await ((_b = this.sessionHost) == null ? void 0 : _b.close());
+    this.sessionHost = void 0;
     await ((_c = this._roomIO) == null ? void 0 : _c.close());
     this._roomIO = void 0;
     await ((_d = this.activity) == null ? void 0 : _d.close());
@@ -783,13 +784,12 @@ class AgentSession extends import_node_events.EventEmitter {
     this.rootSpanContext = void 0;
     this.llmErrorCounts = 0;
     this.ttsErrorCounts = 0;
-    this.interruptionDetectionErrorCounts = 0;
     this.logger.info({ reason, error }, "AgentSession closed");
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AgentSession,
-  defaultSessionOptions
+  defaultAgentSessionOptions
 });
 //# sourceMappingURL=agent_session.cjs.map