@dexto/core 1.6.26 → 1.6.27

package/dist/runtime/host-runtime.js

@@ -0,0 +1,133 @@
+import "../chunk-PTJYTZNU.js";
+import { propagation } from "@opentelemetry/api";
+import { z } from "zod";
+const HOST_RUNTIME_ENTRY_PREFIX = "hostRuntime.ids.";
+const WELL_KNOWN_HOST_RUNTIME_ID_KEYS = ["runtimeId", "runId", "attemptId", "workspaceId"];
+const WELL_KNOWN_HOST_RUNTIME_ID_KEY_SET = new Set(WELL_KNOWN_HOST_RUNTIME_ID_KEYS);
+const HostRuntimeIdKeySchema = z.string().min(1).regex(
+  /^[A-Za-z0-9._-]+$/,
+  "Runtime ID keys may only contain letters, numbers, dot, underscore, or hyphen."
+);
+const HostRuntimeIdValueSchema = z.string().trim().min(1);
+const HostRuntimeIdsSchema = z.record(HostRuntimeIdKeySchema, HostRuntimeIdValueSchema).describe(
+  "Host-owned runtime IDs keyed by a stable identifier name such as runId, attemptId, or workspaceId."
+);
+const HostRuntimeContextSchema = z.object({
+  ids: HostRuntimeIdsSchema.optional().describe(
+    "Optional host-owned runtime IDs used for correlation across orchestration, telemetry, logs, and events."
+  )
+}).strict().describe("Host-owned runtime context surfaced through core runtime flows.");
+function freezeHostRuntimeContext(hostRuntime) {
+  return Object.freeze({
+    ids: Object.freeze({ ...hostRuntime.ids })
+  });
+}
+function normalizeHostRuntimeContext(input) {
+  if (input === void 0) {
+    return void 0;
+  }
+  const parsed = HostRuntimeContextSchema.parse(input);
+  if (!parsed.ids || Object.keys(parsed.ids).length === 0) {
+    return void 0;
+  }
+  return freezeHostRuntimeContext({ ids: parsed.ids });
+}
+function resolveHostRuntimeContext({
+  inherited,
+  explicit,
+  runId
+}) {
+  const ids = {
+    ...inherited?.ids ?? {},
+    ...explicit?.ids ?? {},
+    ...runId !== void 0 ? { runId } : {}
+  };
+  if (Object.keys(ids).length === 0) {
+    return void 0;
+  }
+  return normalizeHostRuntimeContext({ ids });
+}
+function isWellKnownHostRuntimeIdKey(key) {
+  return WELL_KNOWN_HOST_RUNTIME_ID_KEY_SET.has(key);
+}
+function isHostRuntimeBaggageKey(key) {
+  return key.startsWith(HOST_RUNTIME_ENTRY_PREFIX) || WELL_KNOWN_HOST_RUNTIME_ID_KEY_SET.has(key);
+}
+function getValidHostRuntimeIdValue(value) {
+  const parsed = HostRuntimeIdValueSchema.safeParse(value);
+  return parsed.success ? parsed.data : void 0;
+}
+function getHostRuntimeBaggageEntries(hostRuntime) {
+  const ids = hostRuntime?.ids;
+  if (!ids) {
+    return {};
+  }
+  const entries = {};
+  for (const [key, value] of Object.entries(ids)) {
+    entries[`${HOST_RUNTIME_ENTRY_PREFIX}${key}`] = { value };
+    if (isWellKnownHostRuntimeIdKey(key)) {
+      entries[key] = { value };
+    }
+  }
+  return entries;
+}
+function getHostRuntimeAttributes(hostRuntime) {
+  const ids = hostRuntime?.ids;
+  if (!ids) {
+    return {};
+  }
+  const attributes = {};
+  for (const [key, value] of Object.entries(ids)) {
+    attributes[`${HOST_RUNTIME_ENTRY_PREFIX}${key}`] = value;
+    if (isWellKnownHostRuntimeIdKey(key)) {
+      attributes[key] = value;
+    }
+  }
+  return attributes;
+}
+function getHostRuntimeContextFromBaggage(ctx) {
+  const baggage = propagation.getBaggage(ctx);
+  if (!baggage) {
+    return void 0;
+  }
+  const ids = {};
+  for (const [key, entry] of baggage.getAllEntries()) {
+    if (key.startsWith(HOST_RUNTIME_ENTRY_PREFIX)) {
+      const hostRuntimeKey = key.slice(HOST_RUNTIME_ENTRY_PREFIX.length);
+      if (!HostRuntimeIdKeySchema.safeParse(hostRuntimeKey).success) {
+        continue;
+      }
+      const value = getValidHostRuntimeIdValue(entry.value);
+      if (value === void 0) {
+        continue;
+      }
+      ids[hostRuntimeKey] = value;
+    }
+  }
+  for (const key of WELL_KNOWN_HOST_RUNTIME_ID_KEYS) {
+    if (ids[key] !== void 0) {
+      continue;
+    }
+    const entry = baggage.getEntry(key);
+    if (entry) {
+      const value = getValidHostRuntimeIdValue(entry.value);
+      if (value !== void 0) {
+        ids[key] = value;
+      }
+    }
+  }
+  if (Object.keys(ids).length === 0) {
+    return void 0;
+  }
+  return normalizeHostRuntimeContext({ ids });
+}
+export {
+  HostRuntimeContextSchema,
+  HostRuntimeIdsSchema,
+  getHostRuntimeAttributes,
+  getHostRuntimeBaggageEntries,
+  getHostRuntimeContextFromBaggage,
+  isHostRuntimeBaggageKey,
+  normalizeHostRuntimeContext,
+  resolveHostRuntimeContext
+};

package/dist/runtime/index.cjs

@@ -0,0 +1,42 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var runtime_exports = {};
+__export(runtime_exports, {
+  HostRuntimeContextSchema: () => import_host_runtime.HostRuntimeContextSchema,
+  HostRuntimeIdsSchema: () => import_host_runtime.HostRuntimeIdsSchema,
+  buildHostRuntimeBaggageEntries: () => import_host_runtime.getHostRuntimeBaggageEntries,
+  getHostRuntimeAttributes: () => import_host_runtime.getHostRuntimeAttributes,
+  getHostRuntimeBaggageEntries: () => import_host_runtime.getHostRuntimeBaggageEntries,
+  getHostRuntimeContextFromBaggage: () => import_host_runtime.getHostRuntimeContextFromBaggage,
+  normalizeHostRuntimeContext: () => import_host_runtime.normalizeHostRuntimeContext,
+  resolveHostRuntimeContext: () => import_host_runtime.resolveHostRuntimeContext
+});
+module.exports = __toCommonJS(runtime_exports);
+var import_host_runtime = require("./host-runtime.js");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  HostRuntimeContextSchema,
+  HostRuntimeIdsSchema,
+  buildHostRuntimeBaggageEntries,
+  getHostRuntimeAttributes,
+  getHostRuntimeBaggageEntries,
+  getHostRuntimeContextFromBaggage,
+  normalizeHostRuntimeContext,
+  resolveHostRuntimeContext
+});

package/dist/runtime/index.d.ts

@@ -0,0 +1,2 @@
+export { HostRuntimeContextSchema, HostRuntimeIdsSchema, getHostRuntimeBaggageEntries as buildHostRuntimeBaggageEntries, getHostRuntimeAttributes, getHostRuntimeBaggageEntries, getHostRuntimeContextFromBaggage, normalizeHostRuntimeContext, resolveHostRuntimeContext, type HostRuntimeContext, type HostRuntimeIds, } from './host-runtime.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/runtime/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,wBAAwB,EACxB,oBAAoB,EACpB,4BAA4B,IAAI,8BAA8B,EAC9D,wBAAwB,EACxB,4BAA4B,EAC5B,gCAAgC,EAChC,2BAA2B,EAC3B,yBAAyB,EACzB,KAAK,kBAAkB,EACvB,KAAK,cAAc,GACtB,MAAM,mBAAmB,CAAC"}

package/dist/runtime/index.js

@@ -0,0 +1,21 @@
+import "../chunk-PTJYTZNU.js";
+import {
+  HostRuntimeContextSchema,
+  HostRuntimeIdsSchema,
+  getHostRuntimeBaggageEntries,
+  getHostRuntimeAttributes,
+  getHostRuntimeBaggageEntries as getHostRuntimeBaggageEntries2,
+  getHostRuntimeContextFromBaggage,
+  normalizeHostRuntimeContext,
+  resolveHostRuntimeContext
+} from "./host-runtime.js";
+export {
+  HostRuntimeContextSchema,
+  HostRuntimeIdsSchema,
+  getHostRuntimeBaggageEntries as buildHostRuntimeBaggageEntries,
+  getHostRuntimeAttributes,
+  getHostRuntimeBaggageEntries2 as getHostRuntimeBaggageEntries,
+  getHostRuntimeContextFromBaggage,
+  normalizeHostRuntimeContext,
+  resolveHostRuntimeContext
+};

package/dist/runtime/run-context.cjs

@@ -0,0 +1,53 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var run_context_exports = {};
+__export(run_context_exports, {
+  createAgentRunContext: () => createAgentRunContext
+});
+module.exports = __toCommonJS(run_context_exports);
+var import_api = require("@opentelemetry/api");
+var import_host_runtime = require("./host-runtime.js");
+function createAgentRunContext(options) {
+  const hostRuntime = (0, import_host_runtime.normalizeHostRuntimeContext)(options.hostRuntime);
+  const parentContext = options.parentContext ?? import_api.context.active();
+  const existingBaggage = import_api.propagation.getBaggage(parentContext);
+  const baggageEntries = {};
+  if (existingBaggage) {
+    existingBaggage.getAllEntries().forEach(([key, entry]) => {
+      if ((0, import_host_runtime.isHostRuntimeBaggageKey)(key)) {
+        return;
+      }
+      baggageEntries[key] = { ...entry };
+    });
+  }
+  Object.assign(baggageEntries, (0, import_host_runtime.getHostRuntimeBaggageEntries)(hostRuntime));
+  baggageEntries.sessionId = { ...baggageEntries.sessionId, value: options.sessionId };
+  return Object.freeze({
+    sessionId: options.sessionId,
+    ...hostRuntime !== void 0 ? { hostRuntime } : {},
+    telemetryContext: import_api.propagation.setBaggage(
+      parentContext,
+      import_api.propagation.createBaggage(baggageEntries)
+    )
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createAgentRunContext
+});

package/dist/runtime/run-context.d.ts

@@ -0,0 +1,13 @@
+import { type Context } from '@opentelemetry/api';
+import { type HostRuntimeContext } from './host-runtime.js';
+export interface AgentRunContext {
+    sessionId: string;
+    hostRuntime?: HostRuntimeContext | undefined;
+    telemetryContext: Context;
+}
+export declare function createAgentRunContext(options: {
+    sessionId: string;
+    hostRuntime?: HostRuntimeContext | undefined;
+    parentContext?: Context | undefined;
+}): AgentRunContext;
+//# sourceMappingURL=run-context.d.ts.map

package/dist/runtime/run-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-context.d.ts","sourceRoot":"","sources":["../../src/runtime/run-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC3F,OAAO,EAIH,KAAK,kBAAkB,EAC1B,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,eAAe;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAC7C,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAC7C,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC,GAAG,eAAe,CA0BlB"}

package/dist/runtime/run-context.js

@@ -0,0 +1,34 @@
+import "../chunk-PTJYTZNU.js";
+import { context, propagation } from "@opentelemetry/api";
+import {
+  getHostRuntimeBaggageEntries,
+  isHostRuntimeBaggageKey,
+  normalizeHostRuntimeContext
+} from "./host-runtime.js";
+function createAgentRunContext(options) {
+  const hostRuntime = normalizeHostRuntimeContext(options.hostRuntime);
+  const parentContext = options.parentContext ?? context.active();
+  const existingBaggage = propagation.getBaggage(parentContext);
+  const baggageEntries = {};
+  if (existingBaggage) {
+    existingBaggage.getAllEntries().forEach(([key, entry]) => {
+      if (isHostRuntimeBaggageKey(key)) {
+        return;
+      }
+      baggageEntries[key] = { ...entry };
+    });
+  }
+  Object.assign(baggageEntries, getHostRuntimeBaggageEntries(hostRuntime));
+  baggageEntries.sessionId = { ...baggageEntries.sessionId, value: options.sessionId };
+  return Object.freeze({
+    sessionId: options.sessionId,
+    ...hostRuntime !== void 0 ? { hostRuntime } : {},
+    telemetryContext: propagation.setBaggage(
+      parentContext,
+      propagation.createBaggage(baggageEntries)
+    )
+  });
+}
+export {
+  createAgentRunContext
+};

package/dist/session/chat-session.cjs

@@ -31,6 +31,7 @@ var import_error_codes = require("../hooks/error-codes.js");
 var import_message_queue = require("./message-queue.js");
 var import_usage_metadata = require("../llm/usage-metadata.js");
 var import_codex_base_url = require("../llm/providers/codex-base-url.js");
+var import_errors2 = require("./errors.js");
 class ChatSession {
   /**
    * Creates a new ChatSession instance.
@@ -38,7 +39,7 @@ class ChatSession {
    * Each session creates its own isolated services:
    * - ConversationHistoryProvider (with session-specific storage, shared across LLM switches)
    * - LLM service (creates its own properly-typed ContextManager internally)
-   * - SessionEventBus (session-local event handling with forwarding)
+   * - SessionEventBus (session-local event handling)
    *
    * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
    * @param id - Unique identifier for this session
@@ -55,7 +56,7 @@ class ChatSession {
       this.id,
       this.services.messageQueueStore
     );
-    this.setupEventForwarding();
+    this.setupTokenAccumulation();
     this.logger.debug(`ChatSession ${this.id}: Created, awaiting initialization`);
   }
   /**
@@ -87,11 +88,7 @@ class ChatSession {
    * Reused across LLM switches so mid-task follow-ups survive service recreation.
    */
   messageQueue;
-  /**
-   * Map of event forwarder functions for cleanup.
-   * Stores the bound functions so they can be removed from the event bus.
-   */
-  forwarders = /* @__PURE__ */ new Map();
+  activeForwarderCleanup = null;
   /**
    * Token accumulator listener for cleanup.
    */
@@ -109,27 +106,20 @@ class ChatSession {
   async init() {
     await this.initializeServices();
   }
-  /**
-   * Sets up event forwarding from session bus to global agent bus.
-   *
-   * All session events are automatically forwarded to the global bus with the same
-   * event names, but with session context added to the payload. This allows the app
-   * layer to continue listening to standard events while having access to session
-   * information when needed.
-   */
-  setupEventForwarding() {
-    import_events.SessionEventNames.forEach((eventName) => {
-      const forwarder = (payload) => {
-        const payloadWithSession = payload && typeof payload === "object" ? { ...payload, sessionId: this.id } : { sessionId: this.id };
-        this.services.agentEventBus.emit(eventName, payloadWithSession);
-      };
-      this.forwarders.set(eventName, forwarder);
-      this.eventBus.on(eventName, forwarder);
+  attachRunEventForwarders(runContext) {
+    const cleanup = (0, import_events.forwardSessionEventsToAgentBus)({
+      sessionEventBus: this.eventBus,
+      agentEventBus: this.services.agentEventBus,
+      sessionId: this.id,
+      ...runContext?.hostRuntime !== void 0 ? { hostRuntime: runContext.hostRuntime } : {}
     });
-    this.setupTokenAccumulation();
-    this.logger.debug(
-      `[setupEventForwarding] Event forwarding setup complete for session=${this.id}`
-    );
+    this.activeForwarderCleanup = cleanup;
+    return () => {
+      if (this.activeForwarderCleanup === cleanup) {
+        this.activeForwarderCleanup = null;
+      }
+      cleanup();
+    };
   }
   /**
    * Sets up token usage accumulation by listening to llm:response events.
@@ -275,8 +265,12 @@ class ChatSession {
     this.logger.debug(
       `Streaming session ${this.id} | textParts=${textParts.length} | images=${imageParts.length} | files=${fileParts.length}`
     );
+    if (this.isBusy()) {
+      throw import_errors2.SessionError.busy(this.id);
+    }
     this.currentRunController = new AbortController();
     const signal = options?.signal ? this.combineSignals(options.signal, this.currentRunController.signal) : this.currentRunController.signal;
+    const detachForwarders = this.attachRunEventForwarders(options?.runContext);
     try {
       const textContent = textParts.map((p) => p.text).join("\n");
       const firstImage = imageParts[0];
@@ -306,6 +300,7 @@ class ChatSession {
           mcpManager: this.services.mcpManager,
           toolManager: this.services.toolManager,
           stateManager: this.services.stateManager,
+          ...options?.runContext !== void 0 && { runContext: options.runContext },
           sessionId: this.id,
           abortSignal: signal
         }
@@ -315,7 +310,10 @@ class ChatSession {
         modifiedParts = modifiedParts.filter((p) => p.type !== "text");
         modifiedParts.unshift({ type: "text", text: modifiedBeforePayload.text });
       }
-      const streamResult = await this.llmService.stream(modifiedParts, { signal });
+      const streamResult = await this.llmService.stream(modifiedParts, {
+        signal,
+        ...options?.runContext !== void 0 && { runContext: options.runContext }
+      });
       const llmConfig = this.services.stateManager.getLLMConfig(this.id);
       const beforeResponsePayload = {
         content: streamResult.text,
@@ -331,6 +329,7 @@ class ChatSession {
           mcpManager: this.services.mcpManager,
           toolManager: this.services.toolManager,
           stateManager: this.services.stateManager,
+          ...options?.runContext !== void 0 && { runContext: options.runContext },
           sessionId: this.id,
           abortSignal: signal
         }
@@ -386,6 +385,7 @@ class ChatSession {
       );
       throw error;
     } finally {
+      detachForwarders();
       this.currentRunController = null;
     }
   }
@@ -536,10 +536,8 @@ class ChatSession {
    */
   dispose() {
     this.logger.debug(`Disposing session ${this.id} - cleaning up event listeners`);
-    this.forwarders.forEach((forwarder, eventName) => {
-      this.eventBus.off(eventName, forwarder);
-    });
-    this.forwarders.clear();
+    this.activeForwarderCleanup?.();
+    this.activeForwarderCleanup = null;
     if (this.tokenAccumulatorListener) {
       this.eventBus.off("llm:response", this.tokenAccumulatorListener);
       this.tokenAccumulatorListener = null;

package/dist/session/chat-session.d.ts

@@ -15,6 +15,7 @@ import type { MessageQueueStore } from './message-queue-store.js';
 import type { ContentInput } from '../agent/types.js';
 import type { CompactionStrategy } from '../context/compaction/types.js';
 import type { VercelLLMService } from '../llm/services/vercel.js';
+import type { AgentRunContext } from '../runtime/run-context.js';
 /**
  * Represents an isolated conversation session within a Dexto agent.
  *
@@ -91,11 +92,7 @@ export declare class ChatSession {
      * Reused across LLM switches so mid-task follow-ups survive service recreation.
      */
     private messageQueue;
-    /**
-     * Map of event forwarder functions for cleanup.
-     * Stores the bound functions so they can be removed from the event bus.
-     */
-    private forwarders;
+    private activeForwarderCleanup;
     /**
      * Token accumulator listener for cleanup.
      */
@@ -112,7 +109,7 @@ export declare class ChatSession {
      * Each session creates its own isolated services:
      * - ConversationHistoryProvider (with session-specific storage, shared across LLM switches)
      * - LLM service (creates its own properly-typed ContextManager internally)
-     * - SessionEventBus (session-local event handling with forwarding)
+     * - SessionEventBus (session-local event handling)
      *
      * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
      * @param id - Unique identifier for this session
@@ -138,15 +135,7 @@ export declare class ChatSession {
      * This must be called after construction to set up the storage-backed services.
      */
     init(): Promise<void>;
-    /**
-     * Sets up event forwarding from session bus to global agent bus.
-     *
-     * All session events are automatically forwarded to the global bus with the same
-     * event names, but with session context added to the payload. This allows the app
-     * layer to continue listening to standard events while having access to session
-     * information when needed.
-     */
-    private setupEventForwarding;
+    private attachRunEventForwarders;
     /**
      * Sets up token usage accumulation by listening to llm:response events.
      * Accumulates token usage and cost to session metadata for /stats tracking.
@@ -192,6 +181,7 @@ export declare class ChatSession {
      */
     stream(content: ContentInput, options?: {
         signal?: AbortSignal;
+        runContext?: AgentRunContext;
     }): Promise<{
         text: string;
     }>;

package/dist/session/chat-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}

package/dist/session/chat-session.js

@@ -4,7 +4,7 @@ import { createDatabaseHistoryProvider } from "./history/factory.js";
 import { createLLMService } from "../llm/services/factory.js";
 import {
   SessionEventBus,
-  SessionEventNames
+  forwardSessionEventsToAgentBus
 } from "../events/index.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { DextoRuntimeError, ErrorScope, ErrorType } from "../errors/index.js";
@@ -12,6 +12,7 @@ import { HookErrorCode } from "../hooks/error-codes.js";
 import { MessageQueueService } from "./message-queue.js";
 import { getUsagePricingMetadata, hasMeaningfulTokenUsage } from "../llm/usage-metadata.js";
 import { parseCodexBaseURL } from "../llm/providers/codex-base-url.js";
+import { SessionError } from "./errors.js";
 class ChatSession {
   /**
    * Creates a new ChatSession instance.
@@ -19,7 +20,7 @@ class ChatSession {
    * Each session creates its own isolated services:
    * - ConversationHistoryProvider (with session-specific storage, shared across LLM switches)
    * - LLM service (creates its own properly-typed ContextManager internally)
-   * - SessionEventBus (session-local event handling with forwarding)
+   * - SessionEventBus (session-local event handling)
    *
    * @param services - The shared services from the agent (state manager, prompt, client managers, etc.)
    * @param id - Unique identifier for this session
@@ -36,7 +37,7 @@ class ChatSession {
       this.id,
       this.services.messageQueueStore
     );
-    this.setupEventForwarding();
+    this.setupTokenAccumulation();
     this.logger.debug(`ChatSession ${this.id}: Created, awaiting initialization`);
   }
   /**
@@ -68,11 +69,7 @@ class ChatSession {
    * Reused across LLM switches so mid-task follow-ups survive service recreation.
    */
   messageQueue;
-  /**
-   * Map of event forwarder functions for cleanup.
-   * Stores the bound functions so they can be removed from the event bus.
-   */
-  forwarders = /* @__PURE__ */ new Map();
+  activeForwarderCleanup = null;
   /**
    * Token accumulator listener for cleanup.
    */
@@ -90,27 +87,20 @@ class ChatSession {
   async init() {
     await this.initializeServices();
   }
-  /**
-   * Sets up event forwarding from session bus to global agent bus.
-   *
-   * All session events are automatically forwarded to the global bus with the same
-   * event names, but with session context added to the payload. This allows the app
-   * layer to continue listening to standard events while having access to session
-   * information when needed.
-   */
-  setupEventForwarding() {
-    SessionEventNames.forEach((eventName) => {
-      const forwarder = (payload) => {
-        const payloadWithSession = payload && typeof payload === "object" ? { ...payload, sessionId: this.id } : { sessionId: this.id };
-        this.services.agentEventBus.emit(eventName, payloadWithSession);
-      };
-      this.forwarders.set(eventName, forwarder);
-      this.eventBus.on(eventName, forwarder);
+  attachRunEventForwarders(runContext) {
+    const cleanup = forwardSessionEventsToAgentBus({
+      sessionEventBus: this.eventBus,
+      agentEventBus: this.services.agentEventBus,
+      sessionId: this.id,
+      ...runContext?.hostRuntime !== void 0 ? { hostRuntime: runContext.hostRuntime } : {}
     });
-    this.setupTokenAccumulation();
-    this.logger.debug(
-      `[setupEventForwarding] Event forwarding setup complete for session=${this.id}`
-    );
+    this.activeForwarderCleanup = cleanup;
+    return () => {
+      if (this.activeForwarderCleanup === cleanup) {
+        this.activeForwarderCleanup = null;
+      }
+      cleanup();
+    };
   }
   /**
    * Sets up token usage accumulation by listening to llm:response events.
@@ -256,8 +246,12 @@ class ChatSession {
     this.logger.debug(
       `Streaming session ${this.id} | textParts=${textParts.length} | images=${imageParts.length} | files=${fileParts.length}`
     );
+    if (this.isBusy()) {
+      throw SessionError.busy(this.id);
+    }
     this.currentRunController = new AbortController();
     const signal = options?.signal ? this.combineSignals(options.signal, this.currentRunController.signal) : this.currentRunController.signal;
+    const detachForwarders = this.attachRunEventForwarders(options?.runContext);
     try {
       const textContent = textParts.map((p) => p.text).join("\n");
       const firstImage = imageParts[0];
@@ -287,6 +281,7 @@ class ChatSession {
           mcpManager: this.services.mcpManager,
           toolManager: this.services.toolManager,
           stateManager: this.services.stateManager,
+          ...options?.runContext !== void 0 && { runContext: options.runContext },
           sessionId: this.id,
           abortSignal: signal
         }
@@ -296,7 +291,10 @@ class ChatSession {
         modifiedParts = modifiedParts.filter((p) => p.type !== "text");
         modifiedParts.unshift({ type: "text", text: modifiedBeforePayload.text });
       }
-      const streamResult = await this.llmService.stream(modifiedParts, { signal });
+      const streamResult = await this.llmService.stream(modifiedParts, {
+        signal,
+        ...options?.runContext !== void 0 && { runContext: options.runContext }
+      });
       const llmConfig = this.services.stateManager.getLLMConfig(this.id);
       const beforeResponsePayload = {
         content: streamResult.text,
@@ -312,6 +310,7 @@ class ChatSession {
           mcpManager: this.services.mcpManager,
           toolManager: this.services.toolManager,
           stateManager: this.services.stateManager,
+          ...options?.runContext !== void 0 && { runContext: options.runContext },
           sessionId: this.id,
           abortSignal: signal
         }
@@ -367,6 +366,7 @@ class ChatSession {
       );
       throw error;
     } finally {
+      detachForwarders();
       this.currentRunController = null;
     }
   }
@@ -517,10 +517,8 @@ class ChatSession {
    */
   dispose() {
     this.logger.debug(`Disposing session ${this.id} - cleaning up event listeners`);
-    this.forwarders.forEach((forwarder, eventName) => {
-      this.eventBus.off(eventName, forwarder);
-    });
-    this.forwarders.clear();
+    this.activeForwarderCleanup?.();
+    this.activeForwarderCleanup = null;
     if (this.tokenAccumulatorListener) {
       this.eventBus.off("llm:response", this.tokenAccumulatorListener);
       this.tokenAccumulatorListener = null;