@dexto/core 1.7.1 → 1.8.0

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

@@ -1,13 +1,14 @@
 import { LanguageModel } from 'ai';
 import { ToolManager } from '../../tools/tool-manager.js';
-import type { LLMServiceConfig } from './types.js';
+import type { CreateTurnDriverOptions, LLMServiceConfig } from './types.js';
 import type { Logger } from '../../logger/v2/types.js';
 import { ToolSet } from '../../tools/types.js';
 import { ContextManager } from '../../context/manager.js';
 import type { SessionEventBus } from '../../events/index.js';
-import type { ConversationHistoryProvider } from '../../session/history/types.js';
+import type { ConversationStore } from '../../storage/conversation/types.js';
 import type { SystemPromptManager } from '../../systemPrompt/manager.js';
 import type { ValidatedLLMConfig } from '../schemas.js';
+import { type TurnDriver } from '../executor/turn-executor.js';
 import { MessageQueueService } from '../../session/message-queue.js';
 import type { ResourceManager } from '../../resources/index.js';
 import type { ContentInput } from '../../agent/types.js';
@@ -22,7 +23,7 @@ export declare function ensureRunContextMatchesServiceSession(serviceSessionId:
  * - Message persistence via StreamProcessor
  * - Reactive compaction on overflow
  * - Tool output pruning
- * - Message queue injection
+ * - Steer queue injection
  *
  * @see TurnExecutor for the main execution loop
  * @see StreamProcessor for stream event handling
@@ -36,7 +37,8 @@ export declare class VercelLLMService {
     private readonly sessionId;
     private logger;
     private resourceManager;
-    private messageQueue;
+    private steerQueue;
+    private followUpQueue;
     private compactionStrategy;
     private modelLimits?;
     private readonly usageScopeId;
@@ -44,9 +46,10 @@ export declare class VercelLLMService {
      * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
      */
     private getModelId;
-    constructor(toolManager: ToolManager, model: LanguageModel, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: ResourceManager, logger: Logger, messageQueue: MessageQueueService, usageScopeId?: string, compactionStrategy?: import('../../context/compaction/types.js').CompactionStrategy | null);
+    constructor(toolManager: ToolManager, model: LanguageModel, systemPromptManager: SystemPromptManager, conversationStore: ConversationStore, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: ResourceManager, logger: Logger, steerQueue: MessageQueueService, followUpQueue: MessageQueueService, usageScopeId?: string, compactionStrategy?: import('../../context/compaction/types.js').CompactionStrategy | null);
     getAllTools(): Promise<ToolSet>;
     getEnabledTools(): Promise<ToolSet>;
+    createTurnDriver(options?: CreateTurnDriverOptions): Promise<TurnDriver>;
     /**
      * Create a TurnExecutor instance for executing the agent loop.
      */
@@ -81,9 +84,10 @@ export declare class VercelLLMService {
      */
     getContextManager(): ContextManager<unknown>;
     /**
-     * Get the message queue for external access (e.g., queueing messages while busy)
+     * Get the steer queue for external access (e.g., queueing messages while busy)
      */
-    getMessageQueue(): MessageQueueService;
+    getSteerQueue(): MessageQueueService;
+    getFollowUpQueue(): MessageQueueService;
     /**
      * Get the compaction strategy for external access (e.g., session-native compaction)
      */

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

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAqB,MAAM,IAAI,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,wBAAgB,qCAAqC,CACjD,gBAAgB,EAAE,MAAM,EACxB,UAAU,CAAC,EAAE,eAAe,GAC7B,MAAM,CAeR;AAED;;;;;;;;;;;;;GAaG;AACH,qBAIa,gBAAgB;IACzB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,kBAAkB,CAEf;IACX,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAElD;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,mBAAmB,EACjC,YAAY,CAAC,EAAE,MAAM,EACrB,kBAAkB,CAAC,EAAE,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAuC9F,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAMnC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA8B1B;;OAEG;IACH,OAAc,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAE7C;;;;;;;OAOG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,UAAU,CAAC,EAAE,eAAe,CAAC;KAChC,GACF,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IA+D5B;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IA+B7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;IAI5C;;OAEG;IACH,eAAe,IAAI,mBAAmB;IAItC;;OAEG;IACH,qBAAqB,IAAI,OAAO,mCAAmC,EAAE,kBAAkB,GAAG,IAAI;IAI9F,gBAAgB,IAAI,aAAa;CAGpC"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"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"}

package/dist/llm/services/vercel.js

@@ -2,7 +2,7 @@ import {
   __decorateElement,
   __decoratorStart,
   __runInitializers
-} from "../../chunk-PTJYTZNU.js";
+} from "../../chunk-C6A6W6XS.js";
 var _VercelLLMService_decorators, _init;
 import { DextoLogComponent } from "../../logger/v2/types.js";
 import { ContextManager } from "../../context/manager.js";
@@ -42,7 +42,8 @@ class VercelLLMService {
   sessionId;
   logger;
   resourceManager;
-  messageQueue;
+  steerQueue;
+  followUpQueue;
   compactionStrategy;
   modelLimits;
   usageScopeId;
@@ -52,7 +53,7 @@ class VercelLLMService {
   getModelId() {
     return typeof this.model === "string" ? this.model : this.model.modelId;
   }
-  constructor(toolManager, model, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger, messageQueue, usageScopeId, compactionStrategy) {
+  constructor(toolManager, model, systemPromptManager, conversationStore, sessionEventBus, config, sessionId, resourceManager, logger, steerQueue, followUpQueue, usageScopeId, compactionStrategy) {
     this.logger = logger.createChild(DextoLogComponent.LLM);
     this.model = model;
     this.config = config;
@@ -62,7 +63,8 @@ class VercelLLMService {
     this.resourceManager = resourceManager;
     this.usageScopeId = usageScopeId;
     this.compactionStrategy = compactionStrategy ?? null;
-    this.messageQueue = messageQueue;
+    this.steerQueue = steerQueue;
+    this.followUpQueue = followUpQueue;
     const formatter = new VercelMessageFormatter(this.logger);
     const maxInputTokens = getEffectiveMaxInputTokens(config, this.logger);
     if (this.compactionStrategy) {
@@ -73,7 +75,7 @@ class VercelLLMService {
       formatter,
       systemPromptManager,
       maxInputTokens,
-      historyProvider,
+      conversationStore,
       sessionId,
       resourceManager,
       this.logger
@@ -88,6 +90,15 @@ class VercelLLMService {
   getEnabledTools() {
     return this.toolManager.getAllTools().then((tools) => this.toolManager.filterToolsForSession(tools, this.sessionId));
   }
+  async createTurnDriver(options = {}) {
+    const sessionId = ensureRunContextMatchesServiceSession(this.sessionId, options.runContext);
+    const executor = this.createTurnExecutor(options.signal, options.runContext);
+    const contributorContext = await this.toolManager.buildContributorContext({ sessionId });
+    return executor.createDriver(contributorContext, {
+      streaming: options.streaming ?? true,
+      ...options.state !== void 0 ? { state: options.state } : {}
+    });
+  }
   /**
    * Create a TurnExecutor instance for executing the agent loop.
    */
@@ -110,7 +121,8 @@ class VercelLLMService {
       },
       { provider: this.config.provider, model: this.getModelId() },
       this.logger,
-      this.messageQueue,
+      this.steerQueue,
+      this.followUpQueue,
       this.modelLimits,
       externalSignal,
       this.compactionStrategy,
@@ -205,10 +217,13 @@ class VercelLLMService {
     return this.contextManager;
   }
   /**
-   * Get the message queue for external access (e.g., queueing messages while busy)
+   * Get the steer queue for external access (e.g., queueing messages while busy)
    */
-  getMessageQueue() {
-    return this.messageQueue;
+  getSteerQueue() {
+    return this.steerQueue;
+  }
+  getFollowUpQueue() {
+    return this.followUpQueue;
   }
   /**
    * Get the compaction strategy for external access (e.g., session-native compaction)

package/dist/llm/types.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 const LLM_PROVIDERS = [
   "openai",
   "openai-compatible",

package/dist/llm/usage-metadata.cjs

@@ -19,15 +19,31 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var usage_metadata_exports = {};
 __export(usage_metadata_exports, {
   getUsagePricingMetadata: () => getUsagePricingMetadata,
-  hasMeaningfulTokenUsage: () => hasMeaningfulTokenUsage
+  hasMeaningfulTokenUsage: () => hasMeaningfulTokenUsage,
+  normalizeTokenUsageForAccounting: () => normalizeTokenUsageForAccounting
 });
 module.exports = __toCommonJS(usage_metadata_exports);
 var import_registry = require("./registry/index.js");
+function finiteTokenCount(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function normalizeTokenUsageForAccounting(tokenUsage) {
+  const reasoningTokens = finiteTokenCount(tokenUsage?.reasoningTokens);
+  return {
+    inputTokens: finiteTokenCount(tokenUsage?.inputTokens) ?? 0,
+    outputTokens: finiteTokenCount(tokenUsage?.outputTokens) ?? 0,
+    totalTokens: finiteTokenCount(tokenUsage?.totalTokens) ?? 0,
+    cacheReadTokens: finiteTokenCount(tokenUsage?.cacheReadTokens) ?? 0,
+    cacheWriteTokens: finiteTokenCount(tokenUsage?.cacheWriteTokens) ?? 0,
+    ...reasoningTokens !== void 0 && { reasoningTokens }
+  };
+}
 function hasMeaningfulTokenUsage(tokenUsage) {
   if (!tokenUsage) {
     return false;
   }
-  return (tokenUsage.inputTokens ?? 0) > 0 || (tokenUsage.outputTokens ?? 0) > 0 || (tokenUsage.reasoningTokens ?? 0) > 0 || (tokenUsage.cacheReadTokens ?? 0) > 0 || (tokenUsage.cacheWriteTokens ?? 0) > 0 || (tokenUsage.totalTokens ?? 0) > 0;
+  const normalized = normalizeTokenUsageForAccounting(tokenUsage);
+  return (normalized.inputTokens ?? 0) > 0 || (normalized.outputTokens ?? 0) > 0 || (normalized.reasoningTokens ?? 0) > 0 || (normalized.cacheReadTokens ?? 0) > 0 || (normalized.cacheWriteTokens ?? 0) > 0 || (normalized.totalTokens ?? 0) > 0;
 }
 function getUsagePricingMetadata(config) {
   const { provider, model, tokenUsage } = config;
@@ -48,5 +64,6 @@ function getUsagePricingMetadata(config) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getUsagePricingMetadata,
-  hasMeaningfulTokenUsage
+  hasMeaningfulTokenUsage,
+  normalizeTokenUsageForAccounting
 });

package/dist/llm/usage-metadata.d.ts

@@ -5,6 +5,7 @@ export interface LLMUsagePricingMetadata {
     pricingStatus?: LLMPricingStatus;
     costBreakdown?: TokenUsageCostBreakdown;
 }
+export declare function normalizeTokenUsageForAccounting(tokenUsage: TokenUsage | undefined): TokenUsage;
 export declare function hasMeaningfulTokenUsage(tokenUsage: TokenUsage | undefined): boolean;
 export declare function getUsagePricingMetadata(config: {
     provider?: LLMProvider;

package/dist/llm/usage-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage-metadata.d.ts","sourceRoot":"","sources":["../../src/llm/usage-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,uBAAuB,EAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,aAAa,CAAC,EAAE,uBAAuB,CAAC;CAC3C;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAanF;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC5C,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B,GAAG,uBAAuB,CAqB1B"}
+{"version":3,"file":"usage-metadata.d.ts","sourceRoot":"","sources":["../../src/llm/usage-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,uBAAuB,EAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,aAAa,CAAC,EAAE,uBAAuB,CAAC;CAC3C;AAMD,wBAAgB,gCAAgC,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,UAAU,CAW/F;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAcnF;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC5C,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B,GAAG,uBAAuB,CAqB1B"}

package/dist/llm/usage-metadata.js

@@ -1,13 +1,28 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import {
   calculateCostBreakdown,
   getModelPricing
 } from "./registry/index.js";
+function finiteTokenCount(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function normalizeTokenUsageForAccounting(tokenUsage) {
+  const reasoningTokens = finiteTokenCount(tokenUsage?.reasoningTokens);
+  return {
+    inputTokens: finiteTokenCount(tokenUsage?.inputTokens) ?? 0,
+    outputTokens: finiteTokenCount(tokenUsage?.outputTokens) ?? 0,
+    totalTokens: finiteTokenCount(tokenUsage?.totalTokens) ?? 0,
+    cacheReadTokens: finiteTokenCount(tokenUsage?.cacheReadTokens) ?? 0,
+    cacheWriteTokens: finiteTokenCount(tokenUsage?.cacheWriteTokens) ?? 0,
+    ...reasoningTokens !== void 0 && { reasoningTokens }
+  };
+}
 function hasMeaningfulTokenUsage(tokenUsage) {
   if (!tokenUsage) {
     return false;
   }
-  return (tokenUsage.inputTokens ?? 0) > 0 || (tokenUsage.outputTokens ?? 0) > 0 || (tokenUsage.reasoningTokens ?? 0) > 0 || (tokenUsage.cacheReadTokens ?? 0) > 0 || (tokenUsage.cacheWriteTokens ?? 0) > 0 || (tokenUsage.totalTokens ?? 0) > 0;
+  const normalized = normalizeTokenUsageForAccounting(tokenUsage);
+  return (normalized.inputTokens ?? 0) > 0 || (normalized.outputTokens ?? 0) > 0 || (normalized.reasoningTokens ?? 0) > 0 || (normalized.cacheReadTokens ?? 0) > 0 || (normalized.cacheWriteTokens ?? 0) > 0 || (normalized.totalTokens ?? 0) > 0;
 }
 function getUsagePricingMetadata(config) {
   const { provider, model, tokenUsage } = config;
@@ -27,5 +42,6 @@ function getUsagePricingMetadata(config) {
 }
 export {
   getUsagePricingMetadata,
-  hasMeaningfulTokenUsage
+  hasMeaningfulTokenUsage,
+  normalizeTokenUsageForAccounting
 };

package/dist/llm/usage-scope.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { z } from "zod";
 const UsageScopeIdSchema = z.string().trim().min(1);
 export {

package/dist/llm/usage-summary.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { isAssistantMessage } from "../context/types.js";
 function createEmptyCumulativeTokenUsage() {
   return {

package/dist/llm/validation.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { validateModelFileSupport, getAllowedMimeTypes } from "./registry/index.js";
 import { ok, fail } from "../utils/result.js";
 import { ErrorScope, ErrorType } from "../errors/types.js";

package/dist/logger/browser.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 class GlobalLogger {
   level;
   isSilent;

package/dist/logger/default-logger-factory.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { z } from "zod";
 import { createLogger } from "./factory.js";
 import { LoggerConfigSchema } from "./v2/schemas.js";

package/dist/logger/factory.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { DextoLogComponent } from "./v2/types.js";
 import { DextoLogger } from "./v2/dexto-logger.js";
 import { createTransport } from "./v2/transport-factory.js";

package/dist/logger/index.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { createLogger } from "./factory.js";
 import {
   defaultLoggerFactory,

package/dist/logger/logger.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import * as winston from "winston";
 import chalk from "chalk";
 import boxen from "boxen";

package/dist/logger/v2/dexto-logger.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 class DextoLogger {
   /** Shared level reference - allows parent and all children to share the same level */
   levelRef;

package/dist/logger/v2/error-codes.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 var LoggerErrorCode = /* @__PURE__ */ ((LoggerErrorCode2) => {
   LoggerErrorCode2["TRANSPORT_NOT_IMPLEMENTED"] = "logger_transport_not_implemented";
   LoggerErrorCode2["TRANSPORT_UNKNOWN_TYPE"] = "logger_transport_unknown_type";

package/dist/logger/v2/errors.js

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

package/dist/logger/v2/schemas.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { z } from "zod";
 const SilentTransportSchema = z.object({
   type: z.literal("silent")

package/dist/logger/v2/test-utils.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { vi } from "vitest";
 function createMockLogger() {
   const mockLogger = {

package/dist/logger/v2/transport-factory.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { SilentTransport } from "./transports/silent-transport.js";
 import { ConsoleTransport } from "./transports/console-transport.js";
 import { FileTransport } from "./transports/file-transport.js";

package/dist/logger/v2/transports/console-transport.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import chalk from "chalk";
 class ConsoleTransport {
   colorize;

package/dist/logger/v2/transports/file-transport.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import * as fs from "fs";
 import * as path from "path";
 class FileTransport {

package/dist/logger/v2/transports/silent-transport.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 class SilentTransport {
   write(_entry) {
   }

package/dist/logger/v2/types.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 var DextoLogComponent = /* @__PURE__ */ ((DextoLogComponent2) => {
   DextoLogComponent2["AGENT"] = "agent";
   DextoLogComponent2["LLM"] = "llm";

package/dist/mcp/bundled-config.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { existsSync, readFileSync, readdirSync } from "fs";
 import * as path from "path";
 import { ServersConfigSchema } from "./schemas.js";

package/dist/mcp/error-codes.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 var MCPErrorCode = /* @__PURE__ */ ((MCPErrorCode2) => {
   MCPErrorCode2["SCHEMA_VALIDATION"] = "mcp_schema_validation";
   MCPErrorCode2["COMMAND_MISSING"] = "mcp_command_missing";

package/dist/mcp/errors.js

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

package/dist/mcp/index.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { MCPManager } from "./manager.js";
 import { DextoMcpClient } from "./mcp-client.js";
 import {

package/dist/mcp/manager.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { DextoMcpClient } from "./mcp-client.js";
 import { DextoLogComponent } from "../logger/v2/types.js";
 import { MCPError } from "./errors.js";

package/dist/mcp/mcp-client.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { AsyncLocalStorage } from "async_hooks";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";

package/dist/mcp/resolver.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { ok, fail, hasErrors, zodToIssues } from "../utils/result.js";
 import { ErrorScope, ErrorType } from "../errors/types.js";
 import { MCPErrorCode } from "./error-codes.js";

package/dist/mcp/schemas.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { MCPErrorCode } from "./error-codes.js";
 import { ErrorScope, ErrorType } from "../errors/types.js";
 import { EnvExpandedString, RequiredEnvURL } from "../utils/result.js";

package/dist/memory/error-codes.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 var MemoryErrorCode = /* @__PURE__ */ ((MemoryErrorCode2) => {
   MemoryErrorCode2["MEMORY_NOT_FOUND"] = "MEMORY_NOT_FOUND";
   MemoryErrorCode2["MEMORY_ALREADY_EXISTS"] = "MEMORY_ALREADY_EXISTS";

package/dist/memory/errors.js

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

package/dist/memory/index.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 import { MemoryManager } from "./manager.js";
 import {
   MemorySchema,

package/dist/memory/manager.cjs

@@ -27,10 +27,9 @@ var import_error_codes = require("./error-codes.js");
 var import_DextoRuntimeError = require("../errors/DextoRuntimeError.js");
 var import_types = require("../logger/v2/types.js");
 var import_nanoid = require("nanoid");
-const MEMORY_KEY_PREFIX = "memory:item:";
 class MemoryManager {
-  constructor(database, logger) {
-    this.database = database;
+  constructor(memoryStore, logger) {
+    this.memoryStore = memoryStore;
     this.logger = logger.createChild(import_types.DextoLogComponent.MEMORY);
     this.logger.debug("MemoryManager initialized");
   }
@@ -52,7 +51,7 @@ class MemoryManager {
     };
     const validatedMemory = import_schemas.MemorySchema.parse(memory);
     try {
-      await this.database.set(this.toKey(id), validatedMemory);
+      await this.memoryStore.create({ memory: validatedMemory });
       this.logger.info(`Created memory: ${id}`);
       return validatedMemory;
     } catch (error) {
@@ -70,7 +69,7 @@ class MemoryManager {
       throw import_errors.MemoryError.invalidId(id);
     }
     try {
-      const memory = await this.database.get(this.toKey(id));
+      const memory = await this.memoryStore.get({ id });
       if (!memory) {
         throw import_errors.MemoryError.notFound(id);
       }
@@ -108,7 +107,7 @@ class MemoryManager {
     }
     const validatedMemory = import_schemas.MemorySchema.parse(updated);
     try {
-      await this.database.set(this.toKey(id), validatedMemory);
+      await this.memoryStore.update({ memory: validatedMemory });
       this.logger.info(`Updated memory: ${id}`);
       return validatedMemory;
     } catch (error) {
@@ -127,7 +126,7 @@ class MemoryManager {
     }
     await this.get(id);
     try {
-      await this.database.delete(this.toKey(id));
+      await this.memoryStore.delete({ id });
       this.logger.info(`Deleted memory: ${id}`);
     } catch (error) {
       throw import_errors.MemoryError.deleteError(
@@ -142,20 +141,7 @@ class MemoryManager {
   async list(options = {}) {
     const validatedOptions = import_schemas.ListMemoriesOptionsSchema.parse(options);
     try {
-      const keys = await this.database.list(MEMORY_KEY_PREFIX);
-      const memories = [];
-      for (const key of keys) {
-        try {
-          const memory = await this.database.get(key);
-          if (memory) {
-            memories.push(memory);
-          }
-        } catch (error) {
-          this.logger.warn(
-            `Failed to retrieve memory from key ${key}: ${error instanceof Error ? error.message : String(error)}`
-          );
-        }
-      }
+      const memories = await this.memoryStore.list();
       let filtered = memories;
       if (validatedOptions.tags && validatedOptions.tags.length > 0) {
         filtered = filtered.filter(
@@ -203,12 +189,6 @@ class MemoryManager {
     const memories = await this.list(options);
     return memories.length;
   }
-  /**
-   * Convert memory ID to database key
-   */
-  toKey(id) {
-    return `${MEMORY_KEY_PREFIX}${id}`;
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/memory/manager.d.ts

@@ -1,27 +1,23 @@
-import type { Database } from '../storage/database/types.js';
+import type { MemoryStore } from '../storage/memories/types.js';
 import type { Memory, CreateMemoryInput, UpdateMemoryInput, ListMemoriesOptions } from './types.js';
 import type { Logger } from '../logger/v2/types.js';
 /**
  * MemoryManager handles CRUD operations for user memories
  *
  * Responsibilities:
- * - Store and retrieve memories from the database
+ * - Store and retrieve memories from the memory store
  * - Validate memory data
  * - Generate unique IDs for memories
  * - Filter and search memories
  *
- * Storage format:
- * - Key: `memory:item:{id}`
- * - Value: Memory object
- *
  * TODO: Expand to support multi-scope memories (user, agent, entity, session)
  * with namespaced keys (e.g., `memory:user:{userId}:item:{id}`) and
  * context-aware retrieval.
  */
 export declare class MemoryManager {
-    private database;
+    private memoryStore;
     private logger;
-    constructor(database: Database, logger: Logger);
+    constructor(memoryStore: MemoryStore, logger: Logger);
     /**
      * Create a new memory
      */
@@ -50,9 +46,5 @@ export declare class MemoryManager {
      * Get count of total memories
      */
     count(options?: ListMemoriesOptions): Promise<number>;
-    /**
-     * Convert memory ID to database key
-     */
-    private toKey;
 }
 //# sourceMappingURL=manager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/memory/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAUpG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAMpD;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,aAAa;IAIlB,OAAO,CAAC,QAAQ;IAHpB,OAAO,CAAC,MAAM,CAAS;gBAGX,QAAQ,EAAE,QAAQ,EAC1B,MAAM,EAAE,MAAM;IAMlB;;OAEG;IACG,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiCvD;;OAEG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBtC;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IA2CnE;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvC;;OAEG;IACG,IAAI,CAAC,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA8DhE;;OAEG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAevC;;OAEG;IACG,KAAK,CAAC,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAK/D;;OAEG;IACH,OAAO,CAAC,KAAK;CAGhB"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/memory/manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAUpG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;;;;;GAYG;AACH,qBAAa,aAAa;IAIlB,OAAO,CAAC,WAAW;IAHvB,OAAO,CAAC,MAAM,CAAS;gBAGX,WAAW,EAAE,WAAW,EAChC,MAAM,EAAE,MAAM;IAMlB;;OAEG;IACG,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgCvD;;OAEG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBtC;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IA2CnE;;OAEG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvC;;OAEG;IACG,IAAI,CAAC,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA8ChE;;OAEG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAevC;;OAEG;IACG,KAAK,CAAC,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;CAIlE"}