@dexto/core 1.7.2 → 1.8.1

package/dist/context/manager.cjs

@@ -32,8 +32,8 @@ __export(manager_exports, {
 });
 module.exports = __toCommonJS(manager_exports);
 var import_crypto = require("crypto");
-var import_types2 = require("./types.js");
-var import_types3 = require("../logger/v2/types.js");
+var import_types = require("./types.js");
+var import_types2 = require("../logger/v2/types.js");
 var import_utils = require("./utils.js");
 var import_errors = require("./errors.js");
 var import_media_helpers = require("./media-helpers.js");
@@ -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 = logger.createChild(import_types2.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,16 +751,16 @@ ${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 {
-        const { getSupportedFileTypesForModel } = await import("../llm/registry/index.js");
+        const { getSupportedFileTypesForModel } = await import("@dexto/llm");
         const { fileTypesToMimePatterns } = await import("./utils.js");
         const supportedFileTypes = getSupportedFileTypesForModel(
           llmContext.provider,
@@ -782,18 +789,18 @@ ${prompt}`);
         break;
       }
       const message = messageHistory[index];
-      if ((0, import_types2.isUserMessage)(message) && ContextManager.hasRetainableMedia(message)) {
+      if ((0, import_types.isUserMessage)(message) && ContextManager.hasRetainableMedia(message)) {
         retainedMediaMessageIndexes.add(index);
         retainedMediaMessages += 1;
       }
     }
     messageHistory = await Promise.all(
       messageHistory.map(async (message, index) => {
-        if ((0, import_types2.isSystemMessage)(message) || (0, import_types2.isAssistantMessage)(message)) {
+        if ((0, import_types.isSystemMessage)(message) || (0, import_types.isAssistantMessage)(message)) {
           return message;
         }
         const expandMatchingMedia = retainedMediaMessageIndexes.has(index);
-        if ((0, import_types2.isUserMessage)(message)) {
+        if ((0, import_types.isUserMessage)(message)) {
           const expandedContent = await (0, import_utils.expandBlobReferences)(
             message.content,
             this.resourceManager,
@@ -803,7 +810,7 @@ ${prompt}`);
           );
           return { ...message, content: expandedContent };
         }
-        if ((0, import_types2.isToolMessage)(message)) {
+        if ((0, import_types.isToolMessage)(message)) {
           const expandedContent = await (0, import_utils.expandBlobReferences)(
             message.content,
             this.resourceManager,
@@ -868,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;
@@ -968,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);
@@ -997,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}`

package/dist/context/manager.d.ts

@@ -1,23 +1,23 @@
 import { VercelMessageFormatter } from '../llm/formatters/vercel.js';
-import { LLMContext } from '../llm/types.js';
+import type { LLMContext } from '@dexto/llm';
 import type { InternalMessage, AssistantMessage, ToolCall } from './types.js';
 import type { Logger } from '../logger/v2/types.js';
 import type { SanitizedToolResult } from './types.js';
 import { DynamicContributorContext } from '../systemPrompt/types.js';
 import { SystemPromptManager } from '../systemPrompt/manager.js';
-import type { ConversationHistoryProvider } from '../session/history/types.js';
+import type { ConversationStore } from '../storage/conversation/types.js';
 import { ValidatedLLMConfig } from '../llm/schemas.js';
 import type { ToolPresentationSnapshotV1 } from '../tools/types.js';
 import type { ToolCallMetadata } from '../tools/tool-call-metadata.js';
 /**
  * Manages conversation history and provides message formatting capabilities for the LLM context.
  * The ContextManager is responsible for:
- * - Validating and storing conversation messages via the history provider
+ * - Validating and storing conversation messages via the conversation store
  * - Managing the system prompt
  * - Formatting messages for specific LLM providers through an injected formatter
  * - Providing access to conversation history
  *
- * Note: All conversation history is stored and retrieved via the injected ConversationHistoryProvider.
+ * Note: All conversation history is stored and retrieved via the injected ConversationStore.
  * The ContextManager does not maintain an internal history cache.
  * Token counting is handled by the LLM API response, not local estimation.
  *
@@ -58,7 +58,7 @@ export declare class ContextManager<TMessage = unknown> {
      * Messages after this index are estimated with length/4 heuristic.
      */
     private lastCallMessageCount;
-    private historyProvider;
+    private conversationStore;
     private readonly sessionId;
     /**
      * ResourceManager for resolving blob references in message content.
@@ -76,12 +76,12 @@ export declare class ContextManager<TMessage = unknown> {
      * @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: ValidatedLLMConfig, formatter: VercelMessageFormatter, systemPromptManager: SystemPromptManager, maxInputTokens: number, historyProvider: ConversationHistoryProvider, sessionId: string, resourceManager: import('../resources/index.js').ResourceManager, logger: Logger);
+    constructor(llmConfig: ValidatedLLMConfig, formatter: VercelMessageFormatter, systemPromptManager: SystemPromptManager, maxInputTokens: number, conversationStore: ConversationStore, sessionId: string, resourceManager: import('../resources/index.js').ResourceManager, logger: Logger);
     /**
      * Get the ResourceManager instance
      */
@@ -275,7 +275,7 @@ export declare class ContextManager<TMessage = unknown> {
      * @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
      */

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/context/manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAUpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAE/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGvE;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAc,CAAC,QAAQ,GAAG,OAAO;IAC1C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,CAAK;IAE5D;;OAEG;IACH,OAAO,CAAC,SAAS,CAAqB;IAEtC;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAAsB;IAEjD;;OAEG;IACH,OAAO,CAAC,SAAS,CAAyB;IAE1C;;OAEG;IACH,OAAO,CAAC,cAAc,CAAS;IAE/B;;;OAGG;IACH,OAAO,CAAC,qBAAqB,CAAuB;IAEpD;;;;OAIG;IACH,OAAO,CAAC,sBAAsB,CAAuB;IAErD;;;;OAIG;IACH,OAAO,CAAC,oBAAoB,CAAuB;IAEnD,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC;;;;OAIG;IACH,OAAO,CAAC,eAAe,CAAkD;IAEzE,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAYjC,OAAO,CAAC,MAAM,CAAC,kBAAkB;YAyBnB,kBAAkB;IAuGhC;;;;;;;;;;OAUG;gBAEC,SAAS,EAAE,kBAAkB,EAC7B,SAAS,EAAE,sBAAsB,EACjC,mBAAmB,EAAE,mBAAmB,EACxC,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,2BAA2B,EAC5C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,uBAAuB,EAAE,eAAe,EAChE,MAAM,EAAE,MAAM;IAgBlB;;OAEG;IACI,kBAAkB,IAAI,OAAO,uBAAuB,EAAE,eAAe;IAI5E;;;OAGG;YACW,gBAAgB;IAoF9B;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAI3B;;;OAGG;IACH,wBAAwB,IAAI,MAAM,GAAG,IAAI;IAIzC;;;OAGG;IACH,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK9C;;;OAGG;IACH,yBAAyB,IAAI,MAAM,GAAG,IAAI;IAI1C;;;OAGG;IACH,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK/C;;;OAGG;IACH,uBAAuB,IAAI,MAAM,GAAG,IAAI;IAIxC;;;OAGG;IACG,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjD;;;OAGG;IACH,wBAAwB,IAAI,IAAI;IAShC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAuC;IAEtF;;;;;;;;;;;;;OAaG;IACG,cAAc,IAAI,OAAO,CAAC;QAC5B,eAAe,EAAE,eAAe,EAAE,CAAC;QACnC,KAAK,EAAE;YACH,oCAAoC;YACpC,aAAa,EAAE,MAAM,CAAC;YACtB,2DAA2D;YAC3D,aAAa,EAAE,MAAM,CAAC;YACtB,sEAAsE;YACtE,eAAe,EAAE,MAAM,CAAC;SAC3B,CAAC;KACL,CAAC;IA8CF;;OAEG;IACG,eAAe,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IAM1E;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;IAKxD;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;;;;;;OAQG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBnC;;;OAGG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCzE;;;OAGG;IACG,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvE;;;OAGG;IACG,sBAAsB,CACxB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC;IAqBhB;;;;;;;;;;;OAWG;IACG,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IA2CpE;;;;;;;OAOG;IACG,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA8EzD;;;;;;OAMG;IACG,cAAc,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0ChF;;;;;;;;OAQG;IACG,mBAAmB,CACrB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,SAAS,CAAC,EAAE,gBAAgB,CAAC,WAAW,CAAC,EACzC,QAAQ,CAAC,EAAE;QACP,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;QAClD,aAAa,CAAC,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;QAClD,YAAY,CAAC,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;KACnD,GACF,OAAO,CAAC,IAAI,CAAC;IAwBhB;;;;;;;;;;;OAWG;IACG,aAAa,CACf,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,mBAAmB,EACpC,QAAQ,CAAC,EAAE;QACP,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;QACzC,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;QAClD,IAAI,CAAC,EAAE,gBAAgB,CAAC;KAC3B,GACF,OAAO,CAAC,IAAI,CAAC;IAuDhB;;;;;;;;;;;;OAYG;IACG,oBAAoB,CACtB,kBAAkB,EAAE,yBAAyB,EAC7C,UAAU,EAAE,UAAU,EACtB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,CAAC,EAAE,eAAe,EAAE,GAC5B,OAAO,CAAC,QAAQ,EAAE,CAAC;IA2FtB;;;;;;;;;OASG;IACG,0BAA0B,CAC5B,kBAAkB,EAAE,yBAAyB,EAC7C,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC;QACP,iBAAiB,EAAE,QAAQ,EAAE,CAAC;QAC9B,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,EAAE,eAAe,EAAE,CAAC;KACtC,CAAC;IAsBF;;;;;;;;;;;;;;;;;OAiBG;IACG,uBAAuB,CACzB,kBAAkB,EAAE,yBAAyB,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,GACrF,OAAO,CAAC;QACP,6BAA6B;QAC7B,SAAS,EAAE,MAAM,CAAC;QAClB,uEAAuE;QACvE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,4BAA4B;QAC5B,SAAS,EAAE;YACP,YAAY,EAAE,MAAM,CAAC;YACrB,KAAK,EAAE;gBACH,KAAK,EAAE,MAAM,CAAC;gBACd,OAAO,EAAE,KAAK,CAAC;oBAAE,IAAI,EAAE,MAAM,CAAC;oBAAC,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAC,CAAC;aACpD,CAAC;YACF,QAAQ,EAAE,MAAM,CAAC;SACpB,CAAC;QACF,wBAAwB;QACxB,KAAK,EAAE;YACH,oBAAoB,EAAE,MAAM,CAAC;YAC7B,oBAAoB,EAAE,MAAM,CAAC;YAC7B,eAAe,EAAE,MAAM,CAAC;SAC3B,CAAC;QACF,8CAA8C;QAC9C,gBAAgB,CAAC,EAAE;YACf,kEAAkE;YAClE,MAAM,EAAE,SAAS,GAAG,UAAU,CAAC;YAC/B,iEAAiE;YACjE,eAAe,CAAC,EAAE,MAAM,CAAC;YACzB,kEAAkE;YAClE,gBAAgB,CAAC,EAAE,MAAM,CAAC;YAC1B,iFAAiF;YACjF,mBAAmB,CAAC,EAAE,MAAM,CAAC;SAChC,CAAC;KACL,CAAC;IA+FF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0CG;IACG,2BAA2B,CAC7B,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,SAAS,eAAe,EAAE,EAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,GACrF,OAAO,CAAC,MAAM,CAAC;IAwBlB;;;;;;OAMG;IACG,wBAAwB,CAC1B,QAAQ,EAAE,yBAAyB,GACpC,OAAO,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAKrC;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ3C"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/context/manager.ts"],"names":[],"mappings":"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"}

package/dist/context/manager.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { randomUUID } from "crypto";
 import { isSystemMessage, isUserMessage, isAssistantMessage, isToolMessage } from "./types.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
@@ -47,7 +47,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.
@@ -170,22 +170,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(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}`
     );
   }
   /**
@@ -199,7 +199,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") {
@@ -226,20 +226,25 @@ class ContextManager {
     if (shouldStoreAsBlob) {
       try {
         const blobInput = typeof data === "string" && !data.startsWith("data:") && !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;
@@ -295,7 +300,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}`);
   }
@@ -330,7 +335,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 = filterCompacted(fullHistory);
     const filteredCount = history.length;
@@ -382,7 +389,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];
   }
   /**
@@ -391,7 +398,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.
@@ -422,7 +429,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 ContextError.messageNotFound(messageId);
@@ -444,14 +451,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 ContextError.messageNotFound(messageId);
@@ -467,14 +474,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 ContextError.messageNotFound(messageId);
@@ -487,7 +494,7 @@ ${prompt}`);
       throw 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).
@@ -505,7 +512,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) {
@@ -524,7 +531,7 @@ ${prompt}`);
         continue;
       }
       message.compactedAt = timestamp;
-      await this.historyProvider.updateMessage(message);
+      await this.conversationStore.updateMessage({ sessionId: this.sessionId, message });
       markedCount++;
     }
     if (markedCount > 0) {
@@ -586,10 +593,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`);
   }
   /**
@@ -719,16 +726,16 @@ ${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 {
-        const { getSupportedFileTypesForModel } = await import("../llm/registry/index.js");
+        const { getSupportedFileTypesForModel } = await import("@dexto/llm");
         const { fileTypesToMimePatterns } = await import("./utils.js");
         const supportedFileTypes = getSupportedFileTypesForModel(
           llmContext.provider,
@@ -843,7 +850,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 = estimateContextTokens(systemPrompt, preparedHistory, tools);
     let total;
     let calculationBasis;
@@ -943,7 +952,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 = estimateMessagesTokens(newMessages);
@@ -972,7 +983,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}`

package/dist/context/media-helpers.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 function getFileMediaKind(mimeType) {
   if (mimeType?.startsWith("audio/")) return "audio";
   if (mimeType?.startsWith("video/")) return "video";