@dexto/core 1.7.1 → 1.8.0

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

@@ -1,5 +1,10 @@
 import { TokenUsage } from '../types.js';
 import { LLMFinishReason } from '../../events/index.js';
+export type ModelToolCall = {
+    toolCallId: string;
+    toolName: string;
+    input: unknown;
+};
 export interface ExecutorResult {
     /**
      * The accumulated text from assistant responses.
@@ -23,5 +28,6 @@ export interface StreamProcessorResult {
     text: string;
     finishReason: LLMFinishReason;
     usage: TokenUsage;
+    toolCalls: ModelToolCall[];
 }
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,cAAc;IAC3B;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACzB,oCAAoC;IACpC,YAAY,EAAE,eAAe,CAAC;CACjC;AAED,MAAM,WAAW,qBAAqB;IAClC;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,EAAE,UAAU,CAAC;CACrB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,MAAM,aAAa,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,cAAc;IAC3B;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,qCAAqC;IACrC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACzB,oCAAoC;IACpC,YAAY,EAAE,eAAe,CAAC;CACjC;AAED,MAAM,WAAW,qBAAqB;IAClC;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC9B"}

package/dist/llm/formatters/vercel.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import {
   getImageData,
   getFileData,

package/dist/llm/index.cjs

@@ -50,6 +50,7 @@ __reExport(llm_exports, require("./usage-scope.js"), module.exports);
 __reExport(llm_exports, require("./usage-summary.js"), module.exports);
 __reExport(llm_exports, require("./reasoning/profile.js"), module.exports);
 __reExport(llm_exports, require("./services/index.js"), module.exports);
+__reExport(llm_exports, require("./executor/index.js"), module.exports);
 __reExport(llm_exports, require("./schemas.js"), module.exports);
 var import_openrouter_model_registry = require("./providers/openrouter-model-registry.js");
 var import_codex_base_url = require("./providers/codex-base-url.js");
@@ -87,6 +88,7 @@ __reExport(llm_exports, require("./providers/local/index.js"), module.exports);
   ...require("./usage-summary.js"),
   ...require("./reasoning/profile.js"),
   ...require("./services/index.js"),
+  ...require("./executor/index.js"),
   ...require("./schemas.js"),
   ...require("./providers/local/index.js")
 });

package/dist/llm/index.d.ts

@@ -9,6 +9,7 @@ export * from './usage-scope.js';
 export * from './usage-summary.js';
 export * from './reasoning/profile.js';
 export * from './services/index.js';
+export * from './executor/index.js';
 export * from './schemas.js';
 export { getCachedOpenRouterModelsWithInfo, lookupOpenRouterModel, scheduleOpenRouterModelRefresh, refreshOpenRouterModelCache, getOpenRouterModelCacheInfo, getOpenRouterModelContextLength, getOpenRouterModelInfo, type LookupStatus, type OpenRouterModelInfo, } from './providers/openrouter-model-registry.js';
 export { createCodexBaseURL, getCodexAuthModeLabel, getCodexProviderDisplayName, isCodexBaseURL, parseCodexBaseURL, type CodexAuthMode, } from './providers/codex-base-url.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,OAAO,EACH,iCAAiC,EACjC,qBAAqB,EACrB,8BAA8B,EAC9B,2BAA2B,EAC3B,2BAA2B,EAC3B,+BAA+B,EAC/B,sBAAsB,EACtB,KAAK,YAAY,EACjB,KAAK,mBAAmB,GAC3B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACH,kBAAkB,EAClB,qBAAqB,EACrB,2BAA2B,EAC3B,cAAc,EACd,iBAAiB,EACjB,KAAK,aAAa,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACH,oBAAoB,EACpB,wBAAwB,EACxB,KAAK,2BAA2B,EAChC,KAAK,cAAc,EACnB,KAAK,sBAAsB,GAC9B,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EACH,0BAA0B,EAC1B,uBAAuB,EACvB,oBAAoB,EACpB,8BAA8B,EAC9B,KAAK,2BAA2B,GACnC,MAAM,2BAA2B,CAAC;AAGnC,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,OAAO,EACH,iCAAiC,EACjC,qBAAqB,EACrB,8BAA8B,EAC9B,2BAA2B,EAC3B,2BAA2B,EAC3B,+BAA+B,EAC/B,sBAAsB,EACtB,KAAK,YAAY,EACjB,KAAK,mBAAmB,GAC3B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EACH,kBAAkB,EAClB,qBAAqB,EACrB,2BAA2B,EAC3B,cAAc,EACd,iBAAiB,EACjB,KAAK,aAAa,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACH,oBAAoB,EACpB,wBAAwB,EACxB,KAAK,2BAA2B,EAChC,KAAK,cAAc,EACnB,KAAK,sBAAsB,GAC9B,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EACH,0BAA0B,EAC1B,uBAAuB,EACvB,oBAAoB,EACpB,8BAA8B,EAC9B,KAAK,2BAA2B,GACnC,MAAM,2BAA2B,CAAC;AAGnC,cAAc,4BAA4B,CAAC"}

package/dist/llm/index.js

@@ -1,4 +1,4 @@
-import "../chunk-PTJYTZNU.js";
+import "../chunk-C6A6W6XS.js";
 export * from "./errors.js";
 export * from "./error-codes.js";
 export * from "./registry/index.js";
@@ -10,6 +10,7 @@ export * from "./usage-scope.js";
 export * from "./usage-summary.js";
 export * from "./reasoning/profile.js";
 export * from "./services/index.js";
+export * from "./executor/index.js";
 export * from "./schemas.js";
 import {
   getCachedOpenRouterModelsWithInfo,

package/dist/llm/providers/codex-app-server.cjs

@@ -74,6 +74,7 @@ function createCodexClientExitedError(input) {
   );
 }
 const DEFAULT_REQUEST_TIMEOUT_MS = 3e4;
+const CLOSE_GRACE_PERIOD_MS = 1e3;
 const DEFAULT_CLIENT_INFO = {
   name: "dexto",
   title: "Dexto",
@@ -713,8 +714,27 @@ class CodexAppServerClient {
       return;
     }
     await new Promise((resolve) => {
-      child.once("exit", () => resolve());
-      child.kill();
+      let settled = false;
+      const finish = () => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        clearTimeout(timeout);
+        child.off("exit", finish);
+        resolve();
+      };
+      const timeout = setTimeout(() => {
+        try {
+          child.kill("SIGKILL");
+        } catch {
+        }
+        finish();
+      }, CLOSE_GRACE_PERIOD_MS);
+      child.once("exit", finish);
+      if (!child.kill()) {
+        finish();
+      }
     });
   }
   onNotification(listener) {

package/dist/llm/providers/codex-app-server.d.ts.map

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

package/dist/llm/providers/codex-app-server.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import * as fs from "node:fs";
 import { spawn } from "node:child_process";
 import path from "node:path";
@@ -41,6 +41,7 @@ function createCodexClientExitedError(input) {
   );
 }
 const DEFAULT_REQUEST_TIMEOUT_MS = 3e4;
+const CLOSE_GRACE_PERIOD_MS = 1e3;
 const DEFAULT_CLIENT_INFO = {
   name: "dexto",
   title: "Dexto",
@@ -680,8 +681,27 @@ class CodexAppServerClient {
       return;
     }
     await new Promise((resolve) => {
-      child.once("exit", () => resolve());
-      child.kill();
+      let settled = false;
+      const finish = () => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        clearTimeout(timeout);
+        child.off("exit", finish);
+        resolve();
+      };
+      const timeout = setTimeout(() => {
+        try {
+          child.kill("SIGKILL");
+        } catch {
+        }
+        finish();
+      }, CLOSE_GRACE_PERIOD_MS);
+      child.once("exit", finish);
+      if (!child.kill()) {
+        finish();
+      }
     });
   }
   onNotification(listener) {

package/dist/llm/providers/codex-base-url.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 const CODEX_BASE_URL_PROTOCOL = "codex:";
 const CODEX_AUTH_MODES = ["auto", "apikey", "chatgpt"];
 function normalizeCodexAuthMode(value) {

package/dist/llm/providers/local/ai-sdk-adapter.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import {
   loadModel,
   isNodeLlamaCppInstalled

package/dist/llm/providers/local/downloader.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { createWriteStream, promises as fs, existsSync, createReadStream } from "fs";
 import { createHash } from "crypto";
 import * as path from "path";

package/dist/llm/providers/local/error-codes.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 var LocalModelErrorCode = /* @__PURE__ */ ((LocalModelErrorCode2) => {
   LocalModelErrorCode2["NODE_LLAMA_NOT_INSTALLED"] = "LOCAL_001";
   LocalModelErrorCode2["NODE_LLAMA_INSTALL_FAILED"] = "LOCAL_002";

package/dist/llm/providers/local/errors.js

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

package/dist/llm/providers/local/gpu-detector.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { exec } from "child_process";
 import { promisify } from "util";
 import * as os from "os";

package/dist/llm/providers/local/index.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 export * from "./types.js";
 import { LocalModelErrorCode } from "./error-codes.js";
 import { LocalModelError } from "./errors.js";

package/dist/llm/providers/local/node-llama-provider.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { LocalModelError } from "./errors.js";
 import { detectGPU } from "./gpu-detector.js";
 import { getDextoGlobalPath } from "../../../utils/path.js";

package/dist/llm/providers/local/ollama-provider.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { createOpenAI } from "@ai-sdk/openai";
 import { LocalModelError } from "./errors.js";
 const DEFAULT_OLLAMA_URL = "http://localhost:11434";

package/dist/llm/providers/local/registry.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 const LOCAL_MODEL_REGISTRY = [
   // ============================================
   // RECOMMENDED: Best balance of quality and size

package/dist/llm/providers/local/schemas.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { z } from "zod";
 const GPUBackendSchema = z.enum(["metal", "cuda", "vulkan", "cpu"]);
 const QuantizationTypeSchema = z.enum([

package/dist/llm/providers/openrouter-model-registry.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { promises as fs } from "node:fs";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";

package/dist/llm/reasoning/anthropic-betas.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 const ANTHROPIC_BETA_HEADER = "anthropic-beta";
 const ANTHROPIC_INTERLEAVED_THINKING_BETA = "interleaved-thinking-2025-05-14";
 export {

package/dist/llm/reasoning/anthropic-thinking.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 function parseClaudeVersion(model) {
   const modelLower = model.toLowerCase();
   const variantFirst = /claude-(opus|sonnet|haiku)-(\d+)(?:[.-](\d{1,2})(?!\d))?/i.exec(

package/dist/llm/reasoning/openai-reasoning-effort.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 function normalizeOpenAIModelId(model) {
   const id = model.split("/").pop() ?? model;
   return id.toLowerCase();

package/dist/llm/reasoning/profile.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { isReasoningCapableModel } from "../registry/index.js";
 import { isAnthropicAdaptiveThinkingModel, parseClaudeVersion } from "./anthropic-thinking.js";
 import { buildAnthropicReasoningProfile } from "./profiles/anthropic.js";

package/dist/llm/reasoning/profiles/anthropic.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import {
   isAnthropicAdaptiveThinkingModel,
   isAnthropicOpusAdaptiveThinkingModel

package/dist/llm/reasoning/profiles/bedrock.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import {
   buildBudgetProfile,
   nonCapableProfile,

package/dist/llm/reasoning/profiles/google.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { buildBudgetProfile, buildThinkingLevelProfile } from "./shared.js";
 function isGemini3Model(model) {
   return model.toLowerCase().includes("gemini-3");

package/dist/llm/reasoning/profiles/openai-compatible.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { option, withDefault } from "./shared.js";
 function buildOpenAICompatibleReasoningProfile() {
   return withDefault(

package/dist/llm/reasoning/profiles/openai.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { getSupportedOpenAIReasoningEfforts } from "../openai-reasoning-effort.js";
 import { option, withDefault } from "./shared.js";
 function buildOpenAIReasoningProfile(model) {

package/dist/llm/reasoning/profiles/openrouter.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 const OPENROUTER_REASONING_EXCLUDED_FAMILIES = [
   "deepseek",
   "minimax",

package/dist/llm/reasoning/profiles/shared.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 function option(id, label) {
   return { id, label: label ?? id };
 }

package/dist/llm/reasoning/profiles/vertex.js

@@ -1,4 +1,4 @@
-import "../../../chunk-PTJYTZNU.js";
+import "../../../chunk-C6A6W6XS.js";
 import { buildAnthropicReasoningProfile } from "./anthropic.js";
 import { buildGoogleReasoningProfile } from "./google.js";
 function buildVertexReasoningProfile(model) {

package/dist/llm/registry/auto-update.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { promises as fs } from "node:fs";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";

package/dist/llm/registry/index.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { LLMError } from "../errors.js";
 import { LLMErrorCode } from "../error-codes.js";
 import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";

package/dist/llm/registry/models.generated.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 const MODELS_BY_PROVIDER = {
   openai: [
     {

package/dist/llm/registry/models.manual.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 const MANUAL_MODELS_BY_PROVIDER = {
   openai: [
     {

package/dist/llm/registry/sync.js

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

package/dist/llm/resolver.js

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

package/dist/llm/schemas.js

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

package/dist/llm/services/factory.cjs

@@ -237,8 +237,8 @@ function createVercelModel(llmConfig, context) {
       throw import_errors.LLMError.unsupportedProvider(provider);
   }
 }
-function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
-  const { usageScopeId, compactionStrategy, messageQueue } = options;
+function createLLMService(config, toolManager, systemPromptManager, conversationStore, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
+  const { usageScopeId, compactionStrategy, steerQueue, followUpQueue } = options;
   const providerContext = {
     sessionId,
     ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
@@ -259,13 +259,14 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
     toolManager,
     model,
     systemPromptManager,
-    historyProvider,
+    conversationStore,
     sessionEventBus,
     config,
     sessionId,
     resourceManager,
     logger,
-    messageQueue,
+    steerQueue,
+    followUpQueue,
     usageScopeId,
     compactionStrategy
   );

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

@@ -3,7 +3,7 @@ import { ValidatedLLMConfig } from '../schemas.js';
 import { VercelLLMService } from './vercel.js';
 import type { LanguageModel } from 'ai';
 import { 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 { Logger } from '../../logger/v2/types.js';
 import type { CreateLLMServiceOptions, DextoProviderContext, LanguageModelFactory } from './types.js';
@@ -25,7 +25,7 @@ export declare function createVercelModel(llmConfig: ValidatedLLMConfig, context
  * @param config LLM configuration from the config file
  * @param toolManager Unified tool manager instance
  * @param systemPromptManager Prompt manager for system prompts
- * @param historyProvider History provider for conversation persistence
+ * @param conversationStore Store for conversation persistence
  * @param sessionEventBus Session-level event bus for emitting LLM events
  * @param sessionId Session ID
  * @param resourceManager Resource manager for blob storage and resource access
@@ -33,5 +33,5 @@ export declare function createVercelModel(llmConfig: ValidatedLLMConfig, context
  * @param options Session-scoped runtime options
  * @returns VercelLLMService instance
  */
-export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, historyProvider: ConversationHistoryProvider, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, options: CreateLLMServiceOptions, languageModelFactory?: LanguageModelFactory): VercelLLMService;
+export declare function createLLMService(config: ValidatedLLMConfig, toolManager: ToolManager, systemPromptManager: SystemPromptManager, conversationStore: ConversationStore, sessionEventBus: SessionEventBus, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: Logger, options: CreateLLMServiceOptions, languageModelFactory?: LanguageModelFactory): VercelLLMService;
 //# sourceMappingURL=factory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EACR,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AA6DpB;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAyOf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,2BAA2B,EAC5C,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,uBAAuB,EAChC,oBAAoB,CAAC,EAAE,oBAAoB,GAC5C,gBAAgB,CAoClB"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/llm/services/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAYnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EACR,uBAAuB,EACvB,oBAAoB,EACpB,oBAAoB,EACvB,MAAM,YAAY,CAAC;AA6DpB;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,SAAS,EAAE,kBAAkB,EAC7B,OAAO,CAAC,EAAE,oBAAoB,GAC/B,aAAa,CAyOf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,mBAAmB,EACxC,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,uBAAuB,EAChC,oBAAoB,CAAC,EAAE,oBAAoB,GAC5C,gBAAgB,CAqClB"}

package/dist/llm/services/factory.js

@@ -1,4 +1,4 @@
-import "../../chunk-PTJYTZNU.js";
+import "../../chunk-C6A6W6XS.js";
 import { LLMError } from "../errors.js";
 import { createOpenAI } from "@ai-sdk/openai";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
@@ -217,8 +217,8 @@ function createVercelModel(llmConfig, context) {
       throw LLMError.unsupportedProvider(provider);
   }
 }
-function createLLMService(config, toolManager, systemPromptManager, historyProvider, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
-  const { usageScopeId, compactionStrategy, messageQueue } = options;
+function createLLMService(config, toolManager, systemPromptManager, conversationStore, sessionEventBus, sessionId, resourceManager, logger, options, languageModelFactory) {
+  const { usageScopeId, compactionStrategy, steerQueue, followUpQueue } = options;
   const providerContext = {
     sessionId,
     ...options.cwd !== void 0 ? { cwd: options.cwd } : {},
@@ -239,13 +239,14 @@ function createLLMService(config, toolManager, systemPromptManager, historyProvi
     toolManager,
     model,
     systemPromptManager,
-    historyProvider,
+    conversationStore,
     sessionEventBus,
     config,
     sessionId,
     resourceManager,
     logger,
-    messageQueue,
+    steerQueue,
+    followUpQueue,
     usageScopeId,
     compactionStrategy
   );

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

@@ -4,6 +4,8 @@ import type { CodexRateLimitSnapshot } from '../providers/codex-app-server.js';
 import type { ValidatedLLMConfig } from '../schemas.js';
 import type { LLMProvider } from '../types.js';
 import type { MessageQueueService } from '../../session/message-queue.js';
+import type { AgentRunContext } from '../../runtime/run-context.js';
+import type { TurnDriverState } from '../executor/turn-executor.js';
 /**
  * Configuration object returned by the default session LLM service.
  */
@@ -17,8 +19,15 @@ export interface CreateLLMServiceOptions {
     usageScopeId?: string | undefined;
     compactionStrategy?: CompactionStrategy | null | undefined;
     cwd?: string | undefined;
-    messageQueue: MessageQueueService;
+    steerQueue: MessageQueueService;
+    followUpQueue: MessageQueueService;
 }
+export type CreateTurnDriverOptions = {
+    streaming?: boolean;
+    signal?: AbortSignal;
+    runContext?: AgentRunContext;
+    state?: TurnDriverState;
+};
 /**
  * Context for model creation, including session info for usage tracking.
  */

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

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

package/dist/llm/services/vercel.cjs

@@ -106,7 +106,8 @@ class VercelLLMService {
   sessionId;
   logger;
   resourceManager;
-  messageQueue;
+  steerQueue;
+  followUpQueue;
   compactionStrategy;
   modelLimits;
   usageScopeId;
@@ -116,7 +117,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(import_types.DextoLogComponent.LLM);
     this.model = model;
     this.config = config;
@@ -126,7 +127,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 import_vercel.VercelMessageFormatter(this.logger);
     const maxInputTokens = (0, import_registry.getEffectiveMaxInputTokens)(config, this.logger);
     if (this.compactionStrategy) {
@@ -137,7 +139,7 @@ class VercelLLMService {
       formatter,
       systemPromptManager,
       maxInputTokens,
-      historyProvider,
+      conversationStore,
       sessionId,
       resourceManager,
       this.logger
@@ -152,6 +154,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.
    */
@@ -174,7 +185,8 @@ class VercelLLMService {
       },
       { provider: this.config.provider, model: this.getModelId() },
       this.logger,
-      this.messageQueue,
+      this.steerQueue,
+      this.followUpQueue,
       this.modelLimits,
       externalSignal,
       this.compactionStrategy,
@@ -269,10 +281,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)