@dexto/core 1.6.24 → 1.6.26

package/dist/approval/session-approval-store.cjs

@@ -0,0 +1,91 @@
+"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 session_approval_store_exports = {};
+__export(session_approval_store_exports, {
+  SessionApprovalStore: () => SessionApprovalStore
+});
+module.exports = __toCommonJS(session_approval_store_exports);
+var import_zod = require("zod");
+const ApprovedDirectoryTypeSchema = import_zod.z.enum(["session", "once"]);
+const PersistedApprovedDirectorySchema = import_zod.z.object({
+  path: import_zod.z.string(),
+  type: ApprovedDirectoryTypeSchema
+}).strict();
+const SessionApprovalStateSchema = import_zod.z.object({
+  toolPatterns: import_zod.z.record(import_zod.z.array(import_zod.z.string())).default({}),
+  approvedDirectories: import_zod.z.array(PersistedApprovedDirectorySchema).default([])
+}).strict();
+const DEFAULT_APPROVAL_STATE = {
+  toolPatterns: {},
+  approvedDirectories: []
+};
+class SessionApprovalStore {
+  constructor(storageManager, logger, options = {}) {
+    this.storageManager = storageManager;
+    this.logger = logger;
+    const cacheTtlMs = options.cacheTtlMs ?? 36e5;
+    this.cacheTtlSeconds = Math.max(1, Math.floor(cacheTtlMs / 1e3));
+  }
+  cacheTtlSeconds;
+  buildKey(sessionId) {
+    return sessionId ? `session-approvals:${sessionId}` : "session-approvals:global";
+  }
+  async load(sessionId) {
+    const key = this.buildKey(sessionId);
+    const cached = await this.storageManager.getCache().get(key);
+    if (cached !== void 0) {
+      return this.parseState(cached, key);
+    }
+    const stored = await this.storageManager.getDatabase().get(key);
+    if (stored === void 0) {
+      return structuredClone(DEFAULT_APPROVAL_STATE);
+    }
+    const parsed = this.parseState(stored, key);
+    await this.storageManager.getCache().set(key, parsed, this.cacheTtlSeconds);
+    return parsed;
+  }
+  async save(sessionId, state) {
+    const key = this.buildKey(sessionId);
+    const normalized = SessionApprovalStateSchema.parse(state);
+    await this.storageManager.getDatabase().set(key, normalized);
+    await this.storageManager.getCache().set(key, normalized, this.cacheTtlSeconds);
+  }
+  async delete(sessionId) {
+    const key = this.buildKey(sessionId);
+    await Promise.all([
+      this.storageManager.getDatabase().delete(key),
+      this.storageManager.getCache().delete(key)
+    ]);
+  }
+  parseState(value, key) {
+    const result = SessionApprovalStateSchema.safeParse(value);
+    if (result.success) {
+      return result.data;
+    }
+    this.logger.warn("Invalid persisted approval state encountered; using defaults", {
+      key,
+      error: result.error.message
+    });
+    return structuredClone(DEFAULT_APPROVAL_STATE);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SessionApprovalStore
+});

package/dist/approval/session-approval-store.d.ts

@@ -0,0 +1,55 @@
+import { z } from 'zod';
+import type { StorageManager } from '../storage/index.js';
+import type { Logger } from '../logger/v2/types.js';
+declare const PersistedApprovedDirectorySchema: z.ZodObject<{
+    path: z.ZodString;
+    type: z.ZodEnum<["session", "once"]>;
+}, "strict", z.ZodTypeAny, {
+    path: string;
+    type: "session" | "once";
+}, {
+    path: string;
+    type: "session" | "once";
+}>;
+declare const SessionApprovalStateSchema: z.ZodObject<{
+    toolPatterns: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>;
+    approvedDirectories: z.ZodDefault<z.ZodArray<z.ZodObject<{
+        path: z.ZodString;
+        type: z.ZodEnum<["session", "once"]>;
+    }, "strict", z.ZodTypeAny, {
+        path: string;
+        type: "session" | "once";
+    }, {
+        path: string;
+        type: "session" | "once";
+    }>, "many">>;
+}, "strict", z.ZodTypeAny, {
+    toolPatterns: Record<string, string[]>;
+    approvedDirectories: {
+        path: string;
+        type: "session" | "once";
+    }[];
+}, {
+    toolPatterns?: Record<string, string[]> | undefined;
+    approvedDirectories?: {
+        path: string;
+        type: "session" | "once";
+    }[] | undefined;
+}>;
+export type PersistedApprovedDirectory = z.output<typeof PersistedApprovedDirectorySchema>;
+export type SessionApprovalState = z.output<typeof SessionApprovalStateSchema>;
+export declare class SessionApprovalStore {
+    private readonly storageManager;
+    private readonly logger;
+    private readonly cacheTtlSeconds;
+    constructor(storageManager: StorageManager, logger: Logger, options?: {
+        cacheTtlMs?: number;
+    });
+    private buildKey;
+    load(sessionId?: string): Promise<SessionApprovalState>;
+    save(sessionId: string | undefined, state: SessionApprovalState): Promise<void>;
+    delete(sessionId?: string): Promise<void>;
+    private parseState;
+}
+export {};
+//# sourceMappingURL=session-approval-store.d.ts.map

package/dist/approval/session-approval-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-approval-store.d.ts","sourceRoot":"","sources":["../../src/approval/session-approval-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,QAAA,MAAM,gCAAgC;;;;;;;;;EAKzB,CAAC;AAEd,QAAA,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;EAKnB,CAAC;AAEd,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,gCAAgC,CAAC,CAAC;AAC3F,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAO/E,qBAAa,oBAAoB;IAIzB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJ3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;gBAGpB,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,EAC/B,OAAO,GAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAO;IAMzC,OAAO,CAAC,QAAQ;IAIV,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAiBvD,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/E,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/C,OAAO,CAAC,UAAU;CAYrB"}

package/dist/approval/session-approval-store.js

@@ -0,0 +1,68 @@
+import "../chunk-PTJYTZNU.js";
+import { z } from "zod";
+const ApprovedDirectoryTypeSchema = z.enum(["session", "once"]);
+const PersistedApprovedDirectorySchema = z.object({
+  path: z.string(),
+  type: ApprovedDirectoryTypeSchema
+}).strict();
+const SessionApprovalStateSchema = z.object({
+  toolPatterns: z.record(z.array(z.string())).default({}),
+  approvedDirectories: z.array(PersistedApprovedDirectorySchema).default([])
+}).strict();
+const DEFAULT_APPROVAL_STATE = {
+  toolPatterns: {},
+  approvedDirectories: []
+};
+class SessionApprovalStore {
+  constructor(storageManager, logger, options = {}) {
+    this.storageManager = storageManager;
+    this.logger = logger;
+    const cacheTtlMs = options.cacheTtlMs ?? 36e5;
+    this.cacheTtlSeconds = Math.max(1, Math.floor(cacheTtlMs / 1e3));
+  }
+  cacheTtlSeconds;
+  buildKey(sessionId) {
+    return sessionId ? `session-approvals:${sessionId}` : "session-approvals:global";
+  }
+  async load(sessionId) {
+    const key = this.buildKey(sessionId);
+    const cached = await this.storageManager.getCache().get(key);
+    if (cached !== void 0) {
+      return this.parseState(cached, key);
+    }
+    const stored = await this.storageManager.getDatabase().get(key);
+    if (stored === void 0) {
+      return structuredClone(DEFAULT_APPROVAL_STATE);
+    }
+    const parsed = this.parseState(stored, key);
+    await this.storageManager.getCache().set(key, parsed, this.cacheTtlSeconds);
+    return parsed;
+  }
+  async save(sessionId, state) {
+    const key = this.buildKey(sessionId);
+    const normalized = SessionApprovalStateSchema.parse(state);
+    await this.storageManager.getDatabase().set(key, normalized);
+    await this.storageManager.getCache().set(key, normalized, this.cacheTtlSeconds);
+  }
+  async delete(sessionId) {
+    const key = this.buildKey(sessionId);
+    await Promise.all([
+      this.storageManager.getDatabase().delete(key),
+      this.storageManager.getCache().delete(key)
+    ]);
+  }
+  parseState(value, key) {
+    const result = SessionApprovalStateSchema.safeParse(value);
+    if (result.success) {
+      return result.data;
+    }
+    this.logger.warn("Invalid persisted approval state encountered; using defaults", {
+      key,
+      error: result.error.message
+    });
+    return structuredClone(DEFAULT_APPROVAL_STATE);
+  }
+}
+export {
+  SessionApprovalStore
+};

package/dist/llm/executor/stream-processor.cjs

@@ -368,11 +368,8 @@ class StreamProcessor {
           }
           case "error": {
             const err = event.error instanceof Error ? event.error : new Error(String(event.error));
-            this.logger.error("LLM error", { error: err });
-            this.eventBus.emit("llm:error", {
-              error: err
-            });
-            break;
+            await this.persistFailedToolResults(err.message);
+            throw err;
           }
           case "abort": {
             this.logger.debug("Stream aborted, emitting partial response");
@@ -427,11 +424,6 @@ class StreamProcessor {
         };
       }
       this.logger.error("Stream processing failed", { error });
-      this.eventBus.emit("llm:error", {
-        error: error instanceof Error ? error : new Error(String(error)),
-        context: "StreamProcessor",
-        recoverable: false
-      });
       throw error;
     }
     return {
@@ -567,14 +559,31 @@ class StreamProcessor {
    * Called on abort/cancel to prevent "tool_use ids were found without tool_result" errors.
    */
   async persistCancelledToolResults() {
+    await this.persistPendingToolResults({
+      logLabel: "cancelled",
+      resultText: "Cancelled by user",
+      errorMessage: "Cancelled by user"
+    });
+  }
+  /**
+   * Persist synthetic failed results for pending tool calls before surfacing a fatal stream error.
+   */
+  async persistFailedToolResults(errorMessage) {
+    await this.persistPendingToolResults({
+      logLabel: "failed",
+      resultText: `Error: ${errorMessage}`,
+      errorMessage
+    });
+  }
+  async persistPendingToolResults(options) {
     if (this.pendingToolCalls.size === 0) return;
     this.logger.debug(
-      `Persisting cancelled results for ${this.pendingToolCalls.size} pending tool call(s)`
+      `Persisting ${options.logLabel} results for ${this.pendingToolCalls.size} pending tool call(s)`
     );
     for (const [toolCallId, { toolName }] of this.pendingToolCalls) {
       const metadata = this.toolCallMetadata?.get(toolCallId);
-      const cancelledResult = {
-        content: [{ type: "text", text: "Cancelled by user" }],
+      const syntheticResult = {
+        content: [{ type: "text", text: options.resultText }],
         meta: {
           toolName,
           toolCallId,
@@ -584,7 +593,7 @@ class StreamProcessor {
       await this.contextManager.addToolResult(
         toolCallId,
         toolName,
-        cancelledResult,
+        syntheticResult,
         metadata
       );
       this.eventBus.emit("llm:tool-result", {
@@ -597,7 +606,7 @@ class StreamProcessor {
         },
         callId: toolCallId,
         success: false,
-        error: "Cancelled by user",
+        error: options.errorMessage,
         ...metadata?.requireApproval !== void 0 && {
           requireApproval: metadata.requireApproval
         },

package/dist/llm/executor/stream-processor.d.ts

@@ -73,5 +73,10 @@ export declare class StreamProcessor {
      * Called on abort/cancel to prevent "tool_use ids were found without tool_result" errors.
      */
     private persistCancelledToolResults;
+    /**
+     * Persist synthetic failed results for pending tool calls before surfacing a fatal stream error.
+     */
+    private persistFailedToolResults;
+    private persistPendingToolResults;
 }
 //# sourceMappingURL=stream-processor.d.ts.map

package/dist/llm/executor/stream-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-processor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/stream-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAmB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAG1E,OAAO,KAAK,EAAE,WAAW,EAAoB,gBAAgB,EAAc,MAAM,aAAa,CAAC;AA4C/F,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,qBAAa,eAAe;IA4BpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,gBAAgB,CAAC;IAlC7B,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,YAAY,CAAmE;IACvF,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,iBAAiB,CAAsC;IAC/D,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD;;;OAGG;IACH,OAAO,CAAC,gBAAgB,CAAgD;IACxE,OAAO,CAAC,gBAAgB,CAAkE;IAE1F;;;;;;;;;OASG;gBAES,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,qBAAqB,EACrC,MAAM,EAAE,MAAM,EACN,SAAS,GAAE,OAAc,EACzB,gBAAgB,CAAC,EAAE,GAAG,CAC1B,MAAM,EACN;QACI,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;QAClD,IAAI,CAAC,EAAE,gBAAgB,CAAC;QACxB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;KAC5C,CACJ,YAAA;IAMC,OAAO,CACT,QAAQ,EAAE,MAAM,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,GACzD,OAAO,CAAC,qBAAqB,CAAC;IA0gBjC,OAAO,CAAC,kCAAkC;IAoB1C,OAAO,CAAC,cAAc;IA0CtB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,eAAe;YA8BT,gCAAgC;IA0B9C,OAAO,CAAC,sBAAsB;YAwChB,sBAAsB;YAKtB,gBAAgB;IAO9B;;;;OAIG;YACW,2BAA2B;CAiD5C"}
+{"version":3,"file":"stream-processor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/stream-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAmB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAG1E,OAAO,KAAK,EAAE,WAAW,EAAoB,gBAAgB,EAAc,MAAM,aAAa,CAAC;AA4C/F,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,qBAAa,eAAe;IA4BpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,gBAAgB,CAAC;IAlC7B,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,YAAY,CAAmE;IACvF,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,iBAAiB,CAAsC;IAC/D,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD;;;OAGG;IACH,OAAO,CAAC,gBAAgB,CAAgD;IACxE,OAAO,CAAC,gBAAgB,CAAkE;IAE1F;;;;;;;;;OASG;gBAES,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,qBAAqB,EACrC,MAAM,EAAE,MAAM,EACN,SAAS,GAAE,OAAc,EACzB,gBAAgB,CAAC,EAAE,GAAG,CAC1B,MAAM,EACN;QACI,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;QAClD,IAAI,CAAC,EAAE,gBAAgB,CAAC;QACxB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;KAC5C,CACJ,YAAA;IAMC,OAAO,CACT,QAAQ,EAAE,MAAM,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,GACzD,OAAO,CAAC,qBAAqB,CAAC;IA+fjC,OAAO,CAAC,kCAAkC;IAoB1C,OAAO,CAAC,cAAc;IA0CtB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,eAAe;YA8BT,gCAAgC;IA0B9C,OAAO,CAAC,sBAAsB;YAwChB,sBAAsB;YAKtB,gBAAgB;IAO9B;;;;OAIG;YACW,2BAA2B;IAQzC;;OAEG;YACW,wBAAwB;YAQxB,yBAAyB;CAqD1C"}

package/dist/llm/executor/stream-processor.js

@@ -346,11 +346,8 @@ class StreamProcessor {
           }
           case "error": {
             const err = event.error instanceof Error ? event.error : new Error(String(event.error));
-            this.logger.error("LLM error", { error: err });
-            this.eventBus.emit("llm:error", {
-              error: err
-            });
-            break;
+            await this.persistFailedToolResults(err.message);
+            throw err;
           }
           case "abort": {
             this.logger.debug("Stream aborted, emitting partial response");
@@ -405,11 +402,6 @@ class StreamProcessor {
         };
       }
       this.logger.error("Stream processing failed", { error });
-      this.eventBus.emit("llm:error", {
-        error: error instanceof Error ? error : new Error(String(error)),
-        context: "StreamProcessor",
-        recoverable: false
-      });
       throw error;
     }
     return {
@@ -545,14 +537,31 @@ class StreamProcessor {
    * Called on abort/cancel to prevent "tool_use ids were found without tool_result" errors.
    */
   async persistCancelledToolResults() {
+    await this.persistPendingToolResults({
+      logLabel: "cancelled",
+      resultText: "Cancelled by user",
+      errorMessage: "Cancelled by user"
+    });
+  }
+  /**
+   * Persist synthetic failed results for pending tool calls before surfacing a fatal stream error.
+   */
+  async persistFailedToolResults(errorMessage) {
+    await this.persistPendingToolResults({
+      logLabel: "failed",
+      resultText: `Error: ${errorMessage}`,
+      errorMessage
+    });
+  }
+  async persistPendingToolResults(options) {
     if (this.pendingToolCalls.size === 0) return;
     this.logger.debug(
-      `Persisting cancelled results for ${this.pendingToolCalls.size} pending tool call(s)`
+      `Persisting ${options.logLabel} results for ${this.pendingToolCalls.size} pending tool call(s)`
     );
     for (const [toolCallId, { toolName }] of this.pendingToolCalls) {
       const metadata = this.toolCallMetadata?.get(toolCallId);
-      const cancelledResult = {
-        content: [{ type: "text", text: "Cancelled by user" }],
+      const syntheticResult = {
+        content: [{ type: "text", text: options.resultText }],
         meta: {
           toolName,
           toolCallId,
@@ -562,7 +571,7 @@ class StreamProcessor {
       await this.contextManager.addToolResult(
         toolCallId,
         toolName,
-        cancelledResult,
+        syntheticResult,
         metadata
       );
       this.eventBus.emit("llm:tool-result", {
@@ -575,7 +584,7 @@ class StreamProcessor {
         },
         callId: toolCallId,
         success: false,
-        error: "Cancelled by user",
+        error: options.errorMessage,
         ...metadata?.requireApproval !== void 0 && {
           requireApproval: metadata.requireApproval
         },

package/dist/llm/executor/turn-executor.cjs

@@ -187,7 +187,7 @@ class TurnExecutor {
               once: true
             });
           }
-          const coalesced = this.messageQueue.dequeueAll();
+          const coalesced = await this.messageQueue.dequeueAll();
           if (coalesced) {
             await this.injectQueuedMessages(coalesced);
           }
@@ -320,7 +320,7 @@ class TurnExecutor {
             );
           }
           if (result.finishReason !== "tool-calls") {
-            const queuedOnTerminate = this.messageQueue.dequeueAll();
+            const queuedOnTerminate = await this.messageQueue.dequeueAll();
             if (queuedOnTerminate) {
               this.logger.debug(
                 `Continuing: ${queuedOnTerminate.messages.length} queued message(s) to process`
@@ -757,7 +757,11 @@ class TurnExecutor {
     if (!this.stepAbortController.signal.aborted) {
       this.stepAbortController.abort();
     }
-    this.messageQueue.clear();
+    void this.messageQueue.clear().catch((error) => {
+      this.logger.warn(
+        `Failed to clear queued follow-up messages during cleanup: ${error instanceof Error ? error.message : String(error)}`
+      );
+    });
   }
   /**
    * Check if context should be compacted based on estimated token count.

package/dist/llm/executor/turn-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-executor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/turn-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EAMb,KAAK,YAAY,EAEpB,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAQ1D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAK1D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAER,kBAAkB,EAClB,UAAU,EAGb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAQ1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAexE;;;;;;;;;;;GAWG;AACH,qBAAa,YAAY;IAuBjB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,UAAU;IAElB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,cAAc,CAAC;IAzC3B,OAAO,CAAC,MAAM,CAAS;IACvB;;;OAGG;IACH,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,kBAAkB,CAAmC;IAC7D;;;OAGG;IACH,OAAO,CAAC,gBAAgB,CAQpB;gBAGQ,KAAK,EAAE,aAAa,EACpB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,CAAC,YAAY,CAAC,EAC5C,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;QACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QACrC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAElC,SAAS,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;KAC9C,EACO,UAAU,EAAE,UAAU,EAC9B,MAAM,EAAE,MAAM,EACN,YAAY,EAAE,mBAAmB,EACjC,WAAW,CAAC,EAAE,WAAW,YAAA,EACzB,cAAc,CAAC,EAAE,WAAW,YAAA,EACpC,kBAAkB,GAAE,kBAAkB,GAAG,IAAW;IAcxD;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAoBhC;;;;;;OAMG;IACG,OAAO,CACT,kBAAkB,EAAE,yBAAyB,EAC7C,SAAS,GAAE,OAAc,GAC1B,OAAO,CAAC,cAAc,CAAC;IAsV1B;;;OAGG;IACH,KAAK,IAAI,IAAI;IAIb;;;OAGG;YACW,oBAAoB;IAmBlC;;;;;;;;OAQG;YACW,mBAAmB;IAkFjC;;;;;;;OAOG;YACW,WAAW;IAqIzB;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAuF9B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAyBxB;;OAEG;IACH,OAAO,CAAC,eAAe;IAavB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAU;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAU;IAE/C;;;;;;;;;;;OAWG;YACW,mBAAmB;IAkDjC;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;;OAGG;IACH,OAAO,CAAC,OAAO;IAYf;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;;;OAMG;IACH,OAAO,CAAC,uBAAuB;IAO/B;;;;;;;;;;;OAWG;YACW,cAAc;IAwF5B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,qBAAqB;IAK7B;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAyF3B"}
+{"version":3,"file":"turn-executor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/turn-executor.ts"],"names":[],"mappings":"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"}

package/dist/llm/executor/turn-executor.js

@@ -119,7 +119,7 @@ class TurnExecutor {
               once: true
             });
           }
-          const coalesced = this.messageQueue.dequeueAll();
+          const coalesced = await this.messageQueue.dequeueAll();
           if (coalesced) {
             await this.injectQueuedMessages(coalesced);
           }
@@ -252,7 +252,7 @@ class TurnExecutor {
             );
           }
           if (result.finishReason !== "tool-calls") {
-            const queuedOnTerminate = this.messageQueue.dequeueAll();
+            const queuedOnTerminate = await this.messageQueue.dequeueAll();
             if (queuedOnTerminate) {
               this.logger.debug(
                 `Continuing: ${queuedOnTerminate.messages.length} queued message(s) to process`
@@ -689,7 +689,11 @@ class TurnExecutor {
     if (!this.stepAbortController.signal.aborted) {
       this.stepAbortController.abort();
     }
-    this.messageQueue.clear();
+    void this.messageQueue.clear().catch((error) => {
+      this.logger.warn(
+        `Failed to clear queued follow-up messages during cleanup: ${error instanceof Error ? error.message : String(error)}`
+      );
+    });
   }
   /**
    * Check if context should be compacted based on estimated token count.

package/dist/llm/services/factory.cjs

@@ -237,9 +237,9 @@ function createVercelModel(llmConfig, context) {
       throw import_errors.LLMError.unsupportedProvider(provider);
   }
 }
-function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options = {}) {
-  const { usageScopeId, compactionStrategy } = options;
-  const model = createVercelModel(config, {
+function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
+  const { usageScopeId, compactionStrategy, messageQueue } = options;
+  const providerContext = {
     sessionId,
     ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
     onCodexRateLimitStatus: (snapshot) => {
@@ -249,7 +249,12 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
         snapshot
       });
     }
-  });
+  };
+  const model = languageModelFactory?.({
+    config,
+    context: providerContext,
+    createDefaultLanguageModel: () => createVercelModel(config, providerContext)
+  }) ?? createVercelModel(config, providerContext);
   return new import_vercel.VercelLLMService(
     toolManager,
     model,
@@ -260,6 +265,7 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
     sessionId,
     resourceManager,
     logger,
+    messageQueue,
     usageScopeId,
     compactionStrategy
   );

package/dist/llm/services/factory.d.ts

@@ -6,26 +6,7 @@ import { SessionEventBus } from '../../events/index.js';
 import type { ConversationHistoryProvider } from '../../session/history/types.js';
 import type { SystemPromptManager } from '../../systemPrompt/manager.js';
 import type { Logger } from '../../logger/v2/types.js';
-import { type CodexRateLimitSnapshot } from '../providers/codex-app-server.js';
-import type { CompactionStrategy } from '../../context/compaction/types.js';
-/**
- * Context for model creation, including session info for usage tracking.
- */
-export interface DextoProviderContext {
-    /** Session ID for usage tracking */
-    sessionId?: string;
-    /** Client source for usage attribution (cli, web, sdk) */
-    clientSource?: 'cli' | 'web' | 'sdk';
-    /** Working directory for providers that need an explicit workspace root. */
-    cwd?: string;
-    /** Optional callback for ChatGPT Login rate-limit status updates from Codex. */
-    onCodexRateLimitStatus?: (snapshot: CodexRateLimitSnapshot) => void;
-}
-export interface CreateLLMServiceOptions {
-    usageScopeId?: string | undefined;
-    compactionStrategy?: CompactionStrategy | null | undefined;
-    cwd?: string | undefined;
-}
+import type { CreateLLMServiceOptions, DextoProviderContext, LanguageModelFactory } from './types.js';
 /**
  * Create a Vercel AI SDK LanguageModel from config.
  *
@@ -52,5 +33,5 @@ export declare function createVercelModel(llmConfig: ValidatedLLMConfig, context
  * @param options Session-scoped runtime options
  * @returns VercelLLMService instance
  */
-export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, options?: CreateLLMServiceOptions): VercelLLMService;
+export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, options: CreateLLMServiceOptions, languageModelFactory?: LanguageModelFactory): VercelLLMService;
 //# sourceMappingURL=factory.d.ts.map

package/dist/llm/services/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAEH,KAAK,sBAAsB,EAC9B,MAAM,kCAAkC,CAAC;AAQ1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AA2C5E;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACrC,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,uBAAuB;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAUD;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAyOf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,uBAA4B,GACtC,gBAAgB,CA4BlB"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EACR,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AA6DpB;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAyOf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,uBAAuB,EAChC,oBAAoB,CAAC,EAAE,oBAAoB,GAC5C,gBAAgB,CAoClB"}

package/dist/llm/services/factory.js

@@ -15,9 +15,7 @@ import { createCohere } from "@ai-sdk/cohere";
 import { createLocalLanguageModel } from "../providers/local/ai-sdk-adapter.js";
 import { requiresApiKey } from "../registry/index.js";
 import { getPrimaryApiKeyEnvVar, resolveApiKeyForProvider } from "../../utils/api-key-resolver.js";
-import {
-  createCodexLanguageModel
-} from "../providers/codex-app-server.js";
+import { createCodexLanguageModel } from "../providers/codex-app-server.js";
 import { isCodexBaseURL } from "../providers/codex-base-url.js";
 import { findDextoProjectRoot } from "../../utils/execution-context.js";
 import {
@@ -219,9 +217,9 @@ function createVercelModel(llmConfig, context) {
       throw LLMError.unsupportedProvider(provider);
   }
 }
-function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options = {}) {
-  const { usageScopeId, compactionStrategy } = options;
-  const model = createVercelModel(config, {
+function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
+  const { usageScopeId, compactionStrategy, messageQueue } = options;
+  const providerContext = {
     sessionId,
     ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
     onCodexRateLimitStatus: (snapshot) => {
@@ -231,7 +229,12 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
         snapshot
       });
     }
-  });
+  };
+  const model = languageModelFactory?.({
+    config,
+    context: providerContext,
+    createDefaultLanguageModel: () => createVercelModel(config, providerContext)
+  }) ?? createVercelModel(config, providerContext);
   return new VercelLLMService(
     toolManager,
     model,
@@ -242,6 +245,7 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
     sessionId,
     resourceManager,
     logger,
+    messageQueue,
     usageScopeId,
     compactionStrategy
   );

package/dist/llm/services/types.d.ts

@@ -1,7 +1,11 @@
-import { LanguageModel } from 'ai';
+import type { CompactionStrategy } from '../../context/compaction/types.js';
+import type { LanguageModel } from 'ai';
+import type { CodexRateLimitSnapshot } from '../providers/codex-app-server.js';
+import type { ValidatedLLMConfig } from '../schemas.js';
 import type { LLMProvider } from '../types.js';
+import type { MessageQueueService } from '../../session/message-queue.js';
 /**
- * Configuration object returned by LLMService.getConfig()
+ * Configuration object returned by the default session LLM service.
  */
 export type LLMServiceConfig = {
     provider: LLMProvider;
@@ -9,6 +13,33 @@ export type LLMServiceConfig = {
     configuredMaxInputTokens?: number | null;
     modelMaxInputTokens?: number | null;
 };
+export interface CreateLLMServiceOptions {
+    usageScopeId?: string | undefined;
+    compactionStrategy?: CompactionStrategy | null | undefined;
+    cwd?: string | undefined;
+    messageQueue: MessageQueueService;
+}
+/**
+ * Context for model creation, including session info for usage tracking.
+ */
+export interface DextoProviderContext {
+    /** Session ID for usage tracking */
+    sessionId?: string;
+    /** Client source for usage attribution (cli, web, sdk) */
+    clientSource?: 'cli' | 'web' | 'sdk';
+    /** Working directory for providers that need an explicit workspace root. */
+    cwd?: string;
+    /** Optional callback for ChatGPT Login rate-limit status updates from Codex. */
+    onCodexRateLimitStatus?: (snapshot: CodexRateLimitSnapshot) => void;
+}
+export interface LanguageModelFactoryInput {
+    config: ValidatedLLMConfig;
+    context: DextoProviderContext;
+}
+export interface LanguageModelFactoryContext extends LanguageModelFactoryInput {
+    createDefaultLanguageModel: () => LanguageModel;
+}
+export type LanguageModelFactory = (context: LanguageModelFactoryContext) => LanguageModel;
 /**
  * Token usage statistics from LLM
  */

package/dist/llm/services/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/services/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC3B,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,aAAa,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/services/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAE1E;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC3B,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,aAAa,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3D,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,YAAY,EAAE,mBAAmB,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,oCAAoC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC;IACrC,4EAA4E;IAC5E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,yBAAyB;IACtC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,OAAO,EAAE,oBAAoB,CAAC;CACjC;AAED,MAAM,WAAW,2BAA4B,SAAQ,yBAAyB;IAC1E,0BAA0B,EAAE,MAAM,aAAa,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,2BAA2B,KAAK,aAAa,CAAC;AAE3F;;GAEG;AACH,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B"}