@dexto/core 1.7.1 → 1.8.0

package/dist/config/index.d.ts

@@ -0,0 +1,15 @@
+export { AgentCardSchema, type AgentCard, type ValidatedAgentCard } from '../agent/schemas.js';
+export { EnvExpandedString, NonEmptyEnvExpandedString, RequiredEnvURL } from '../utils/result.js';
+export { ErrorScope, ErrorType } from '../errors/types.js';
+export { StorageErrorCode } from '../storage/error-codes.js';
+export { LLMConfigSchema, type LLMConfig, type ValidatedLLMConfig } from '../llm/schemas.js';
+export { LoggerConfigSchema, type LoggerConfig } from '../logger/v2/schemas.js';
+export { ServersConfigSchema, type ServersConfig, type ValidatedServersConfig, } from '../mcp/schemas.js';
+export { MemoriesConfigSchema, type MemoriesConfig, type ValidatedMemoriesConfig, } from '../memory/schemas.js';
+export { PromptsSchema, type PromptsConfig, type ValidatedPromptsConfig, } from '../prompts/schemas.js';
+export { ResourcesConfigSchema, type ResourcesConfig, type ValidatedResourcesConfig, } from '../resources/schemas.js';
+export { SessionConfigSchema, type SessionConfig, type ValidatedSessionConfig, } from '../session/schemas.js';
+export { SystemPromptConfigSchema, type SystemPromptConfig, type ValidatedSystemPromptConfig, } from '../systemPrompt/schemas.js';
+export { ElicitationConfigSchema, PermissionsConfigSchema, type ElicitationConfig, type PermissionsConfig, type ValidatedElicitationConfig, type ValidatedPermissionsConfig, } from '../tools/schemas.js';
+export { OtelConfigurationSchema, type OtelConfiguration } from '../telemetry/schemas.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EACH,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,sBAAsB,GAC9B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACH,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,uBAAuB,GAC/B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACH,aAAa,EACb,KAAK,aAAa,EAClB,KAAK,sBAAsB,GAC9B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,wBAAwB,GAChC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,sBAAsB,GAC9B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,wBAAwB,EACxB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,GACnC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACH,uBAAuB,EACvB,uBAAuB,EACvB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,0BAA0B,EAC/B,KAAK,0BAA0B,GAClC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/config/index.js

@@ -0,0 +1,50 @@
+import "../chunk-C6A6W6XS.js";
+import { AgentCardSchema } from "../agent/schemas.js";
+import { EnvExpandedString, NonEmptyEnvExpandedString, RequiredEnvURL } from "../utils/result.js";
+import { ErrorScope, ErrorType } from "../errors/types.js";
+import { StorageErrorCode } from "../storage/error-codes.js";
+import { LLMConfigSchema } from "../llm/schemas.js";
+import { LoggerConfigSchema } from "../logger/v2/schemas.js";
+import {
+  ServersConfigSchema
+} from "../mcp/schemas.js";
+import {
+  MemoriesConfigSchema
+} from "../memory/schemas.js";
+import {
+  PromptsSchema
+} from "../prompts/schemas.js";
+import {
+  ResourcesConfigSchema
+} from "../resources/schemas.js";
+import {
+  SessionConfigSchema
+} from "../session/schemas.js";
+import {
+  SystemPromptConfigSchema
+} from "../systemPrompt/schemas.js";
+import {
+  ElicitationConfigSchema,
+  PermissionsConfigSchema
+} from "../tools/schemas.js";
+import { OtelConfigurationSchema } from "../telemetry/schemas.js";
+export {
+  AgentCardSchema,
+  ElicitationConfigSchema,
+  EnvExpandedString,
+  ErrorScope,
+  ErrorType,
+  LLMConfigSchema,
+  LoggerConfigSchema,
+  MemoriesConfigSchema,
+  NonEmptyEnvExpandedString,
+  OtelConfigurationSchema,
+  PermissionsConfigSchema,
+  PromptsSchema,
+  RequiredEnvURL,
+  ResourcesConfigSchema,
+  ServersConfigSchema,
+  SessionConfigSchema,
+  StorageErrorCode,
+  SystemPromptConfigSchema
+};

package/dist/context/compaction/overflow.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 function isOverflow(tokens, modelLimits, thresholdPercent = 0.9) {
   const { contextWindow } = modelLimits;
   const effectiveLimit = Math.floor(contextWindow * thresholdPercent);

package/dist/context/compaction/strategies/noop.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 class NoOpCompactionStrategy {
   name = "noop";
   settings;

package/dist/context/compaction/strategies/reactive-overflow-compaction.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { generateText } from "ai";
 import { isAssistantMessage, isToolMessage } from "../../types.js";
 import { isOverflow } from "../overflow.js";

package/dist/context/content-clone.cjs

@@ -0,0 +1,131 @@
+"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 content_clone_exports = {};
+__export(content_clone_exports, {
+  cloneContentPart: () => cloneContentPart,
+  cloneContentParts: () => cloneContentParts,
+  cloneInternalMessage: () => cloneInternalMessage,
+  cloneInternalMessages: () => cloneInternalMessages,
+  clonePromptContentPart: () => clonePromptContentPart
+});
+module.exports = __toCommonJS(content_clone_exports);
+function cloneBinaryData(data) {
+  if (typeof data === "string") return data;
+  if (data instanceof URL) return new URL(data.href);
+  if (data instanceof ArrayBuffer) return data.slice(0);
+  if (typeof Buffer !== "undefined" && Buffer.isBuffer(data)) return Buffer.from(data);
+  return new Uint8Array(data);
+}
+function cloneImagePart(part) {
+  const cloned = {
+    type: "image",
+    image: cloneBinaryData(part.image)
+  };
+  if (part.mimeType) {
+    cloned.mimeType = part.mimeType;
+  }
+  return cloned;
+}
+function cloneFilePart(part) {
+  const cloned = {
+    type: "file",
+    data: cloneBinaryData(part.data),
+    mimeType: part.mimeType
+  };
+  if (part.filename) {
+    cloned.filename = part.filename;
+  }
+  return cloned;
+}
+function cloneContentPart(part) {
+  switch (part.type) {
+    case "text":
+      return { type: "text", text: part.text };
+    case "image":
+      return cloneImagePart(part);
+    case "file":
+      return cloneFilePart(part);
+    case "resource":
+      return {
+        type: "resource",
+        uri: part.uri,
+        name: part.name,
+        mimeType: part.mimeType,
+        kind: part.kind,
+        ...part.size !== void 0 ? { size: part.size } : {},
+        ...part.metadata !== void 0 ? { metadata: structuredClone(part.metadata) } : {}
+      };
+    case "ui-resource":
+      return {
+        type: "ui-resource",
+        uri: part.uri,
+        mimeType: part.mimeType,
+        ...part.content !== void 0 ? { content: part.content } : {},
+        ...part.blob !== void 0 ? { blob: part.blob } : {},
+        ...part.metadata !== void 0 ? { metadata: structuredClone(part.metadata) } : {}
+      };
+  }
+}
+function cloneContentParts(content) {
+  return content.map((part) => cloneContentPart(part));
+}
+function clonePromptContentPart(part) {
+  switch (part.type) {
+    case "text":
+      return { type: "text", text: part.text };
+    case "image":
+      return cloneImagePart(part);
+    case "file":
+      return cloneFilePart(part);
+  }
+}
+function cloneInternalMessage(message) {
+  switch (message.role) {
+    case "assistant": {
+      const cloned = structuredClone(message);
+      return {
+        ...cloned,
+        content: message.content === null ? null : cloneContentParts(message.content)
+      };
+    }
+    case "system": {
+      const cloned = structuredClone(message);
+      return { ...cloned, content: cloneContentParts(message.content) };
+    }
+    case "user": {
+      const cloned = structuredClone(message);
+      return { ...cloned, content: cloneContentParts(message.content) };
+    }
+    case "tool": {
+      const cloned = structuredClone(message);
+      return { ...cloned, content: cloneContentParts(message.content) };
+    }
+  }
+}
+function cloneInternalMessages(messages) {
+  return messages.map((message) => cloneInternalMessage(message));
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cloneContentPart,
+  cloneContentParts,
+  cloneInternalMessage,
+  cloneInternalMessages,
+  clonePromptContentPart
+});

package/dist/context/content-clone.d.ts

@@ -0,0 +1,7 @@
+import type { ContentPart, FilePart, ImagePart, InternalMessage, TextPart } from './types.js';
+export declare function cloneContentPart(part: ContentPart): ContentPart;
+export declare function cloneContentParts(content: ContentPart[]): ContentPart[];
+export declare function clonePromptContentPart(part: TextPart | ImagePart | FilePart): TextPart | ImagePart | FilePart;
+export declare function cloneInternalMessage(message: InternalMessage): InternalMessage;
+export declare function cloneInternalMessages(messages: InternalMessage[]): InternalMessage[];
+//# sourceMappingURL=content-clone.d.ts.map

package/dist/context/content-clone.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-clone.d.ts","sourceRoot":"","sources":["../../src/context/content-clone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmC9F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW,CAgC/D;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAEvE;AAED,wBAAgB,sBAAsB,CAClC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,GACtC,QAAQ,GAAG,SAAS,GAAG,QAAQ,CASjC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe,CAsB9E;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,eAAe,EAAE,CAEpF"}

package/dist/context/content-clone.js

@@ -0,0 +1,104 @@
+import "../chunk-C6A6W6XS.js";
+function cloneBinaryData(data) {
+  if (typeof data === "string") return data;
+  if (data instanceof URL) return new URL(data.href);
+  if (data instanceof ArrayBuffer) return data.slice(0);
+  if (typeof Buffer !== "undefined" && Buffer.isBuffer(data)) return Buffer.from(data);
+  return new Uint8Array(data);
+}
+function cloneImagePart(part) {
+  const cloned = {
+    type: "image",
+    image: cloneBinaryData(part.image)
+  };
+  if (part.mimeType) {
+    cloned.mimeType = part.mimeType;
+  }
+  return cloned;
+}
+function cloneFilePart(part) {
+  const cloned = {
+    type: "file",
+    data: cloneBinaryData(part.data),
+    mimeType: part.mimeType
+  };
+  if (part.filename) {
+    cloned.filename = part.filename;
+  }
+  return cloned;
+}
+function cloneContentPart(part) {
+  switch (part.type) {
+    case "text":
+      return { type: "text", text: part.text };
+    case "image":
+      return cloneImagePart(part);
+    case "file":
+      return cloneFilePart(part);
+    case "resource":
+      return {
+        type: "resource",
+        uri: part.uri,
+        name: part.name,
+        mimeType: part.mimeType,
+        kind: part.kind,
+        ...part.size !== void 0 ? { size: part.size } : {},
+        ...part.metadata !== void 0 ? { metadata: structuredClone(part.metadata) } : {}
+      };
+    case "ui-resource":
+      return {
+        type: "ui-resource",
+        uri: part.uri,
+        mimeType: part.mimeType,
+        ...part.content !== void 0 ? { content: part.content } : {},
+        ...part.blob !== void 0 ? { blob: part.blob } : {},
+        ...part.metadata !== void 0 ? { metadata: structuredClone(part.metadata) } : {}
+      };
+  }
+}
+function cloneContentParts(content) {
+  return content.map((part) => cloneContentPart(part));
+}
+function clonePromptContentPart(part) {
+  switch (part.type) {
+    case "text":
+      return { type: "text", text: part.text };
+    case "image":
+      return cloneImagePart(part);
+    case "file":
+      return cloneFilePart(part);
+  }
+}
+function cloneInternalMessage(message) {
+  switch (message.role) {
+    case "assistant": {
+      const cloned = structuredClone(message);
+      return {
+        ...cloned,
+        content: message.content === null ? null : cloneContentParts(message.content)
+      };
+    }
+    case "system": {
+      const cloned = structuredClone(message);
+      return { ...cloned, content: cloneContentParts(message.content) };
+    }
+    case "user": {
+      const cloned = structuredClone(message);
+      return { ...cloned, content: cloneContentParts(message.content) };
+    }
+    case "tool": {
+      const cloned = structuredClone(message);
+      return { ...cloned, content: cloneContentParts(message.content) };
+    }
+  }
+}
+function cloneInternalMessages(messages) {
+  return messages.map((message) => cloneInternalMessage(message));
+}
+export {
+  cloneContentPart,
+  cloneContentParts,
+  cloneInternalMessage,
+  cloneInternalMessages,
+  clonePromptContentPart
+};

package/dist/context/error-codes.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 var ContextErrorCode = /* @__PURE__ */ ((ContextErrorCode2) => {
   ContextErrorCode2["MESSAGE_ROLE_MISSING"] = "context_message_role_missing";
   ContextErrorCode2["MESSAGE_CONTENT_EMPTY"] = "context_message_content_empty";

package/dist/context/errors.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { DextoRuntimeError } from "../errors/index.js";
 import { ErrorScope, ErrorType } from "../errors/types.js";
 import { ContextErrorCode } from "./error-codes.js";

package/dist/context/index.cjs

@@ -24,6 +24,7 @@ __export(context_exports, {
 });
 module.exports = __toCommonJS(context_exports);
 __reExport(context_exports, require("./manager.js"), module.exports);
+__reExport(context_exports, require("./schemas.js"), module.exports);
 __reExport(context_exports, require("./types.js"), module.exports);
 var import_media_helpers = require("./media-helpers.js");
 __reExport(context_exports, require("./compaction/index.js"), module.exports);
@@ -32,6 +33,7 @@ __reExport(context_exports, require("./compaction/index.js"), module.exports);
   getFileMediaKind,
   getResourceKind,
   ...require("./manager.js"),
+  ...require("./schemas.js"),
   ...require("./types.js"),
   ...require("./compaction/index.js")
 });

package/dist/context/index.d.ts

@@ -1,4 +1,5 @@
 export * from './manager.js';
+export * from './schemas.js';
 export * from './types.js';
 export { getFileMediaKind, getResourceKind } from './media-helpers.js';
 export * from './compaction/index.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/context/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACvE,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/context/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACvE,cAAc,uBAAuB,CAAC"}

package/dist/context/index.js

@@ -1,5 +1,6 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 export * from "./manager.js";
+export * from "./schemas.js";
 export * from "./types.js";
 import { getFileMediaKind, getResourceKind } from "./media-helpers.js";
 export * from "./compaction/index.js";

package/dist/context/manager.cjs

@@ -72,7 +72,7 @@ class ContextManager {
    * Messages after this index are estimated with length/4 heuristic.
    */
   lastCallMessageCount = null;
-  historyProvider;
+  conversationStore;
   sessionId;
   /**
    * ResourceManager for resolving blob references in message content.
@@ -195,22 +195,22 @@ class ContextManager {
    * @param formatter Formatter implementation for the target LLM provider
    * @param systemPromptManager SystemPromptManager instance for the conversation
    * @param maxInputTokens Maximum token limit for the conversation history.
-   * @param historyProvider Session-scoped ConversationHistoryProvider instance for managing conversation history
+   * @param conversationStore Store for managing conversation history
    * @param sessionId Unique identifier for the conversation session (readonly, for debugging)
    * @param resourceManager ResourceManager for resolving blob references in messages
    * @param logger Logger instance for logging
    */
-  constructor(llmConfig, formatter, systemPromptManager, maxInputTokens, historyProvider, sessionId, resourceManager, logger) {
+  constructor(llmConfig, formatter, systemPromptManager, maxInputTokens, conversationStore, sessionId, resourceManager, logger) {
     this.llmConfig = llmConfig;
     this.formatter = formatter;
     this.systemPromptManager = systemPromptManager;
     this.maxInputTokens = maxInputTokens;
-    this.historyProvider = historyProvider;
+    this.conversationStore = conversationStore;
     this.sessionId = sessionId;
     this.resourceManager = resourceManager;
     this.logger = logger.createChild(import_types3.DextoLogComponent.CONTEXT);
     this.logger.debug(
-      `ContextManager: Initialized for session ${sessionId} - history will be managed by ${historyProvider.constructor.name}`
+      `ContextManager: Initialized for session ${sessionId} - history will be managed by ${conversationStore.constructor.name}`
     );
   }
   /**
@@ -224,7 +224,7 @@ class ContextManager {
    * Returns either the original data or a blob reference (@blob:id).
    */
   async processUserInput(data, metadata) {
-    const blobService = this.resourceManager.getBlobStore();
+    const artifactStore = this.resourceManager.getArtifactStore();
     let shouldStoreAsBlob = false;
     let estimatedSize = 0;
     if (typeof data === "string") {
@@ -251,20 +251,25 @@ class ContextManager {
     if (shouldStoreAsBlob) {
       try {
         const blobInput = typeof data === "string" && !data.startsWith("data:") && !(0, import_utils.isLikelyBase64String)(data) && !isLikelyBinary ? Buffer.from(data, "utf-8") : data;
-        const blobRef = await blobService.store(blobInput, {
-          mimeType: metadata.mimeType,
-          originalName: metadata.originalName,
-          source: metadata.source || "user"
+        const artifactRef = await artifactStore.store({
+          data: blobInput,
+          metadata: {
+            mimeType: metadata.mimeType,
+            ...metadata.originalName !== void 0 && {
+              originalName: metadata.originalName
+            },
+            source: metadata.source || "user"
+          }
         });
         this.logger.info(
-          `Stored user input as blob: ${blobRef.uri} (${estimatedSize} bytes, ${metadata.mimeType})`
+          `Stored user input as artifact: ${artifactRef.uri} (${estimatedSize} bytes, ${metadata.mimeType})`
         );
         this.resourceManager.emitCacheInvalidated({
-          resourceUri: blobRef.uri,
+          resourceUri: artifactRef.uri,
           serverName: "internal",
           action: "blob_stored"
         });
-        return `@${blobRef.uri}`;
+        return `@${artifactRef.uri}`;
       } catch (error) {
         this.logger.warn(`Failed to store user input as blob: ${String(error)}`);
         return data;
@@ -320,7 +325,7 @@ class ContextManager {
    * This marks the boundary for "new messages" calculation.
    */
   async recordLastCallMessageCount() {
-    const history = await this.historyProvider.getHistory();
+    const history = await this.conversationStore.listMessages({ sessionId: this.sessionId });
     this.lastCallMessageCount = history.length;
     this.logger.debug(`Recorded lastCallMessageCount: ${this.lastCallMessageCount}`);
   }
@@ -355,7 +360,9 @@ class ContextManager {
    * @returns Prepared history and statistics about the transformations
    */
   async prepareHistory() {
-    const fullHistory = await this.historyProvider.getHistory();
+    const fullHistory = await this.conversationStore.listMessages({
+      sessionId: this.sessionId
+    });
     const originalCount = fullHistory.length;
     let history = (0, import_utils.filterCompacted)(fullHistory);
     const filteredCount = history.length;
@@ -407,7 +414,7 @@ ${prompt}`);
    * @returns Promise that resolves to a read-only copy of the conversation history
    */
   async getHistory() {
-    const history = await this.historyProvider.getHistory();
+    const history = await this.conversationStore.listMessages({ sessionId: this.sessionId });
     return [...history];
   }
   /**
@@ -416,7 +423,7 @@ ${prompt}`);
    * This ensures all message updates are persisted before returning control to the caller.
    */
   async flush() {
-    await this.historyProvider.flush();
+    await this.conversationStore.flush({ sessionId: this.sessionId });
   }
   /**
    * Clears the context window without deleting history.
@@ -447,7 +454,7 @@ ${prompt}`);
    * Used for streaming responses.
    */
   async appendAssistantText(messageId, text) {
-    const history = await this.historyProvider.getHistory();
+    const history = await this.conversationStore.listMessages({ sessionId: this.sessionId });
     const messageIndex = history.findIndex((m) => m.id === messageId);
     if (messageIndex === -1) {
       throw import_errors.ContextError.messageNotFound(messageId);
@@ -469,14 +476,14 @@ ${prompt}`);
         message.content.push({ type: "text", text });
       }
     }
-    await this.historyProvider.updateMessage(message);
+    await this.conversationStore.updateMessage({ sessionId: this.sessionId, message });
   }
   /**
    * Adds a tool call to an existing assistant message.
    * Used for streaming responses.
    */
   async addToolCall(messageId, toolCall) {
-    const history = await this.historyProvider.getHistory();
+    const history = await this.conversationStore.listMessages({ sessionId: this.sessionId });
     const messageIndex = history.findIndex((m) => m.id === messageId);
     if (messageIndex === -1) {
       throw import_errors.ContextError.messageNotFound(messageId);
@@ -492,14 +499,14 @@ ${prompt}`);
       message.toolCalls = [];
     }
     message.toolCalls.push(toolCall);
-    await this.historyProvider.updateMessage(message);
+    await this.conversationStore.updateMessage({ sessionId: this.sessionId, message });
   }
   /**
    * Updates an existing assistant message with new properties.
    * Used for finalizing streaming responses (e.g. adding token usage).
    */
   async updateAssistantMessage(messageId, updates) {
-    const history = await this.historyProvider.getHistory();
+    const history = await this.conversationStore.listMessages({ sessionId: this.sessionId });
     const messageIndex = history.findIndex((m) => m.id === messageId);
     if (messageIndex === -1) {
       throw import_errors.ContextError.messageNotFound(messageId);
@@ -512,7 +519,7 @@ ${prompt}`);
       throw import_errors.ContextError.messageNotAssistant(messageId);
     }
     Object.assign(message, updates);
-    await this.historyProvider.updateMessage(message);
+    await this.conversationStore.updateMessage({ sessionId: this.sessionId, message });
   }
   /**
    * Marks tool messages as compacted (pruned).
@@ -530,7 +537,7 @@ ${prompt}`);
     if (messageIds.length === 0) {
       return 0;
     }
-    const history = await this.historyProvider.getHistory();
+    const history = await this.conversationStore.listMessages({ sessionId: this.sessionId });
     const timestamp = Date.now();
     let markedCount = 0;
     for (const messageId of messageIds) {
@@ -549,7 +556,7 @@ ${prompt}`);
         continue;
       }
       message.compactedAt = timestamp;
-      await this.historyProvider.updateMessage(message);
+      await this.conversationStore.updateMessage({ sessionId: this.sessionId, message });
       markedCount++;
     }
     if (markedCount > 0) {
@@ -611,10 +618,10 @@ ${prompt}`);
       message.timestamp = Date.now();
     }
     this.logger.debug(
-      `ContextManager: Adding message to history provider: ${JSON.stringify(message, null, 2)}`
+      `ContextManager: Adding message to conversation store: ${JSON.stringify(message, null, 2)}`
     );
-    await this.historyProvider.saveMessage(message);
-    const history = await this.historyProvider.getHistory();
+    await this.conversationStore.saveMessage({ sessionId: this.sessionId, message });
+    const history = await this.conversationStore.listMessages({ sessionId: this.sessionId });
     this.logger.debug(`ContextManager: History now contains ${history.length} messages`);
   }
   /**
@@ -744,12 +751,12 @@ ${prompt}`);
    * @param contributorContext The DynamicContributorContext for system prompt contributors and formatting
    * @param llmContext The llmContext for the formatter to decide which messages to include based on the model's capabilities
    * @param systemPrompt (Optional) Precomputed system prompt string. If provided, it will be used instead of recomputing the system prompt. Useful for avoiding duplicate computation when both the formatted messages and the raw system prompt are needed in the same request.
-   * @param history (Optional) Pre-fetched and potentially compressed history. If not provided, will fetch from history provider.
+   * @param history (Optional) Pre-fetched and potentially compressed history. If not provided, will fetch from the conversation store.
    * @returns Formatted messages ready to send to the LLM provider API
    * @throws Error if formatting or compression fails critically
    */
   async getFormattedMessages(contributorContext, llmContext, systemPrompt, history) {
-    let messageHistory = history ?? await this.historyProvider.getHistory();
+    let messageHistory = history ?? await this.conversationStore.listMessages({ sessionId: this.sessionId });
     let allowedMediaTypes = this.llmConfig.allowedMediaTypes;
     if (!allowedMediaTypes) {
       try {
@@ -781,7 +788,8 @@ ${prompt}`);
       if (retainedMediaMessages >= ContextManager.PROMPT_MEDIA_RETENTION_MESSAGES) {
         break;
       }
-      if (ContextManager.hasRetainableMedia(messageHistory[index])) {
+      const message = messageHistory[index];
+      if ((0, import_types2.isUserMessage)(message) && ContextManager.hasRetainableMedia(message)) {
         retainedMediaMessageIndexes.add(index);
         retainedMediaMessages += 1;
       }
@@ -808,7 +816,7 @@ ${prompt}`);
             this.resourceManager,
             this.logger,
             allowedMediaTypes,
-            expandMatchingMedia
+            false
           );
           return { ...message, content: expandedContent };
         }
@@ -867,7 +875,9 @@ ${prompt}`);
     const lastInput = this.lastActualInputTokens;
     const lastOutput = this.lastActualOutputTokens;
     const lastMsgCount = this.lastCallMessageCount;
-    const currentHistory = await this.historyProvider.getHistory();
+    const currentHistory = await this.conversationStore.listMessages({
+      sessionId: this.sessionId
+    });
     const pureEstimate = (0, import_utils.estimateContextTokens)(systemPrompt, preparedHistory, tools);
     let total;
     let calculationBasis;
@@ -967,7 +977,9 @@ ${prompt}`);
     const lastInput = this.lastActualInputTokens;
     const lastOutput = this.lastActualOutputTokens;
     const lastMsgCount = this.lastCallMessageCount;
-    const currentHistory = await this.historyProvider.getHistory();
+    const currentHistory = await this.conversationStore.listMessages({
+      sessionId: this.sessionId
+    });
     if (lastInput !== null && lastOutput !== null && lastMsgCount !== null) {
       const newMessages = currentHistory.slice(lastMsgCount);
       const newMessagesEstimate = (0, import_utils.estimateMessagesTokens)(newMessages);
@@ -996,7 +1008,7 @@ ${prompt}`);
    * Does not reset the system prompt
    */
   async resetConversation() {
-    await this.historyProvider.clearHistory();
+    await this.conversationStore.clearMessages({ sessionId: this.sessionId });
     this.resetActualTokenTracking();
     this.logger.debug(
       `ContextManager: Conversation history cleared for session ${this.sessionId}`