@vellumai/assistant 0.4.42 → 0.4.44

package/src/daemon/session-usage.ts

@@ -1,10 +1,15 @@
 import { getConfig } from "../config/loader.js";
-import * as conversationStore from "../memory/conversation-store.js";
+import { updateConversationUsage } from "../memory/conversation-crud.js";
 import { recordUsageEvent } from "../memory/llm-usage-store.js";
 import type { UsageActor } from "../usage/actors.js";
+import type {
+  AnthropicCacheCreationTokenDetails,
+  PricingResult,
+  PricingUsage,
+} from "../usage/types.js";
 import { getLogger } from "../util/logger.js";
-import { estimateCost, resolvePricingWithOverrides } from "../util/pricing.js";
-import type { ServerMessage, UsageStats } from "./ipc-protocol.js";
+import { resolvePricingForUsageWithOverrides } from "../util/pricing.js";
+import type { ServerMessage, UsageStats } from "./message-protocol.js";
 
 const log = getLogger("session-usage");
 
@@ -14,6 +19,81 @@ export interface UsageContext {
   usageStats: UsageStats;
 }
 
+function normalizeTokenCount(value: number | null | undefined): number {
+  if (typeof value !== "number" || !Number.isFinite(value)) return 0;
+  return Math.max(value, 0);
+}
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  if (typeof value !== "object" || value == null) return null;
+  return value as Record<string, unknown>;
+}
+
+function extractAnthropicCacheCreationFromResponse(
+  response: unknown,
+): AnthropicCacheCreationTokenDetails | null {
+  const rawResponse = asRecord(response);
+  const usage = asRecord(rawResponse?.usage);
+  const cacheCreation = asRecord(usage?.cache_creation);
+  if (!cacheCreation) return null;
+
+  return {
+    ephemeral_5m_input_tokens: normalizeTokenCount(
+      cacheCreation.ephemeral_5m_input_tokens as number | null | undefined,
+    ),
+    ephemeral_1h_input_tokens: normalizeTokenCount(
+      cacheCreation.ephemeral_1h_input_tokens as number | null | undefined,
+    ),
+  };
+}
+
+function extractAnthropicCacheCreation(
+  rawResponse: unknown,
+): AnthropicCacheCreationTokenDetails | null {
+  const responses = Array.isArray(rawResponse) ? rawResponse : [rawResponse];
+  let foundDetails = false;
+  let ephemeral5mInputTokens = 0;
+  let ephemeral1hInputTokens = 0;
+
+  for (const response of responses) {
+    const details = extractAnthropicCacheCreationFromResponse(response);
+    if (!details) continue;
+    foundDetails = true;
+    ephemeral5mInputTokens += normalizeTokenCount(
+      details.ephemeral_5m_input_tokens,
+    );
+    ephemeral1hInputTokens += normalizeTokenCount(
+      details.ephemeral_1h_input_tokens,
+    );
+  }
+
+  if (!foundDetails) return null;
+
+  return {
+    ephemeral_5m_input_tokens: ephemeral5mInputTokens,
+    ephemeral_1h_input_tokens: ephemeral1hInputTokens,
+  };
+}
+
+function resolveStructuredPricing(
+  providerName: string,
+  model: string,
+  usage: PricingUsage,
+): PricingResult {
+  try {
+    const config = getConfig();
+    return resolvePricingForUsageWithOverrides(
+      providerName,
+      model,
+      usage,
+      config.pricingOverrides,
+    );
+  } catch (err) {
+    log.warn({ err, model, providerName }, "Failed to resolve usage pricing");
+    return { estimatedCostUsd: null, pricingStatus: "unpriced" };
+  }
+}
+
 export function recordUsage(
   ctx: UsageContext,
   inputTokens: number,
@@ -22,20 +102,49 @@ export function recordUsage(
   onEvent: (msg: ServerMessage) => void,
   actor: UsageActor,
   requestId: string | null = null,
+  cacheCreationInputTokens = 0,
+  cacheReadInputTokens = 0,
+  rawResponse?: unknown,
 ): void {
   if (inputTokens <= 0 && outputTokens <= 0) return;
 
-  const estimatedCost = estimateCost(
-    inputTokens,
+  const normalizedCacheCreationInputTokens = normalizeTokenCount(
+    cacheCreationInputTokens,
+  );
+  const normalizedCacheReadInputTokens =
+    normalizeTokenCount(cacheReadInputTokens);
+  const directInputTokens = Math.max(
+    normalizeTokenCount(inputTokens) -
+      normalizedCacheCreationInputTokens -
+      normalizedCacheReadInputTokens,
+    0,
+  );
+
+  const pricingUsage: PricingUsage = {
+    directInputTokens,
     outputTokens,
-    model,
+    cacheCreationInputTokens: normalizedCacheCreationInputTokens,
+    cacheReadInputTokens: normalizedCacheReadInputTokens,
+    anthropicCacheCreation:
+      ctx.providerName === "anthropic"
+        ? extractAnthropicCacheCreation(rawResponse)
+        : null,
+  };
+  const pricing = resolveStructuredPricing(
     ctx.providerName,
+    model,
+    pricingUsage,
   );
+  const estimatedCost =
+    pricing.pricingStatus === "priced" && pricing.estimatedCostUsd != null
+      ? pricing.estimatedCostUsd
+      : 0;
+
   ctx.usageStats.inputTokens += inputTokens;
   ctx.usageStats.outputTokens += outputTokens;
   ctx.usageStats.estimatedCost += estimatedCost;
 
-  conversationStore.updateConversationUsage(
+  updateConversationUsage(
     ctx.conversationId,
     ctx.usageStats.inputTokens,
     ctx.usageStats.outputTokens,
@@ -53,23 +162,15 @@ export function recordUsage(
 
   // Dual-write: persist per-turn usage event to the new ledger table
   try {
-    const config = getConfig();
-    const pricing = resolvePricingWithOverrides(
-      ctx.providerName,
-      model,
-      inputTokens,
-      outputTokens,
-      config.pricingOverrides,
-    );
     recordUsageEvent(
       {
         actor,
         provider: ctx.providerName,
         model,
-        inputTokens,
+        inputTokens: directInputTokens,
         outputTokens,
-        cacheCreationInputTokens: null,
-        cacheReadInputTokens: null,
+        cacheCreationInputTokens: normalizedCacheCreationInputTokens,
+        cacheReadInputTokens: normalizedCacheReadInputTokens,
         conversationId: ctx.conversationId,
         runId: null,
         requestId,

package/src/daemon/session.ts

@@ -22,7 +22,6 @@ import type {
   TurnInterfaceContext,
 } from "../channels/types.js";
 import { getConfig } from "../config/loader.js";
-import { buildSystemPrompt } from "../config/system-prompt.js";
 import { ContextWindowManager } from "../context/window-manager.js";
 import { EventBus } from "../events/bus.js";
 import type { AssistantDomainEvents } from "../events/domain-events.js";
@@ -39,6 +38,7 @@ import { getHookManager } from "../hooks/manager.js";
 import { PermissionPrompter } from "../permissions/prompter.js";
 import { SecretPrompter } from "../permissions/secret-prompter.js";
 import type { UserDecision } from "../permissions/types.js";
+import { buildSystemPrompt } from "../prompts/system-prompt.js";
 import type { Message } from "../providers/types.js";
 import type { Provider } from "../providers/types.js";
 import type { TrustClass } from "../runtime/actor-trust-resolver.js";
@@ -46,17 +46,17 @@ import type { AuthContext } from "../runtime/auth/types.js";
 import * as approvalOverrides from "../runtime/session-approval-overrides.js";
 import { ToolExecutor } from "../tools/executor.js";
 import type { AssistantAttachmentDraft } from "./assistant-attachments.js";
-import type {
-  AssistantActivityState,
-  ConfirmationStateChanged,
-} from "./ipc-contract/messages.js";
 import type {
   ServerMessage,
   SurfaceData,
   SurfaceType,
   UsageStats,
   UserMessageAttachment,
-} from "./ipc-protocol.js";
+} from "./message-protocol.js";
+import type {
+  AssistantActivityState,
+  ConfirmationStateChanged,
+} from "./message-types/messages.js";
 import { runAgentLoopImpl } from "./session-agent-loop.js";
 import { ConflictGate } from "./session-conflict-gate.js";
 import type { HistorySessionContext } from "./session-history.js";
@@ -213,15 +213,6 @@ export class Session {
   /** @internal */ currentTurnInterfaceContext: TurnInterfaceContext | null =
     null;
   /** @internal */ activityVersion = 0;
-  /**
-   * Optional callback invoked whenever a server-authoritative state signal
-   * (confirmation_state_changed or assistant_activity_state) is emitted.
-   *
-   * HTTP/SSE sessions set this so the hub publisher receives these events —
-   * without it, the signals only travel through `sendToClient`, which is a
-   * no-op for socketless sessions.
-   */
-  private onStateSignal?: (msg: ServerMessage) => void;
   /** Set by the agent loop to track confirmation outcomes for persistence. */
   onConfirmationOutcome?: (
     requestId: string,
@@ -251,8 +242,8 @@ export class Session {
     this.traceEmitter = new TraceEmitter(conversationId, sendToClient);
     this.prompter = new PermissionPrompter(sendToClient);
     this.prompter.setOnStateChanged((requestId, state, source, toolUseId) => {
-      // Route through emitConfirmationStateChanged so the onStateSignal
-      // listener publishes to the SSE hub for HTTP/SSE consumers.
+      // Route through emitConfirmationStateChanged so the event reaches
+      // the client via sendToClient (wired to the SSE hub for HTTP sessions).
       this.emitConfirmationStateChanged({
         sessionId: this.conversationId,
         requestId,
@@ -352,11 +343,11 @@ export class Session {
       resolveTools,
       resolveSystemPromptCallback,
     );
-    this.contextWindowManager = new ContextWindowManager(
+    this.contextWindowManager = new ContextWindowManager({
       provider,
       systemPrompt,
-      config.contextWindow,
-    );
+      config: config.contextWindow,
+    });
 
     void getHookManager().trigger("session-start", {
       sessionId: this.conversationId,
@@ -392,17 +383,6 @@ export class Session {
     return this.sendToClient;
   }
 
-  /**
-   * Register a callback for server-authoritative state signals
-   * (confirmation_state_changed, assistant_activity_state).
-   *
-   * This enables HTTP/SSE sessions to receive these events through the
-   * hub publisher, since `sendToClient` is a no-op for socketless sessions.
-   */
-  setStateSignalListener(listener: (msg: ServerMessage) => void): void {
-    this.onStateSignal = listener;
-  }
-
   setSandboxOverride(enabled: boolean | undefined): void {
     this.sandboxOverride = enabled;
   }
@@ -603,7 +583,6 @@ export class Session {
       ...params,
     } as ServerMessage;
     this.sendToClient(msg);
-    this.onStateSignal?.(msg);
   }
 
   emitActivityState(
@@ -625,7 +604,6 @@ export class Session {
       ...(statusText ? { statusText } : {}),
     } as ServerMessage;
     this.sendToClient(msg);
-    this.onStateSignal?.(msg);
   }
 
   setChannelCapabilities(caps: ChannelCapabilities | null): void {

package/src/daemon/tool-side-effects.ts

@@ -17,7 +17,7 @@ import type { ToolExecutionResult } from "../tools/types.js";
 import { getLogger } from "../util/logger.js";
 import { getWorkspaceDir } from "../util/platform.js";
 import { isDoordashCommand, updateDoordashProgress } from "./doordash-steps.js";
-import type { ServerMessage } from "./ipc-protocol.js";
+import type { ServerMessage } from "./message-protocol.js";
 import { refreshSurfacesForApp } from "./session-surfaces.js";
 import type { ToolSetupContext } from "./session-tool-setup.js";
 
@@ -214,13 +214,12 @@ registerHook(
 registerHook(
   "voice_config_update",
   (_name, input, _result, { broadcastToAllClients }) => {
-    const setting =
-      (input.setting as string) ??
-      (input.activation_key ? "activation_key" : undefined);
+    const setting = input.setting as string | undefined;
     if (!setting) return;
 
     const SETTING_TO_KEY: Record<string, string> = {
       activation_key: "pttActivationKey",
+      tts_voice_id: "ttsVoiceId",
       wake_word_enabled: "wakeWordEnabled",
       wake_word_keyword: "wakeWordKeyword",
       wake_word_timeout: "wakeWordTimeoutSeconds",
@@ -230,7 +229,7 @@ registerHook(
 
     // Coerce the value to the correct type before broadcasting, matching
     // the validation logic in the tool's execute method.
-    const raw = input.value ?? input.activation_key;
+    const raw = input.value;
     let coerced: string | boolean | number = raw as string;
     if (setting === "wake_word_enabled") {
       coerced = raw === true || raw === "true";
@@ -238,6 +237,8 @@ registerHook(
       coerced = typeof raw === "number" ? raw : Number(raw);
     } else if (setting === "wake_word_keyword" && typeof raw === "string") {
       coerced = raw.trim();
+    } else if (setting === "tts_voice_id" && typeof raw === "string") {
+      coerced = raw.trim();
     }
     broadcastToAllClients?.({
       type: "client_settings_update",

package/src/daemon/trace-emitter.ts

@@ -1,6 +1,6 @@
 import { v4 as uuid } from "uuid";
 
-import type { ServerMessage, TraceEventKind } from "./ipc-protocol.js";
+import type { ServerMessage, TraceEventKind } from "./message-protocol.js";
 
 export type TraceEventStatus = "info" | "success" | "warning" | "error";
 

package/src/daemon/{guardian-verification-intent.ts → verification-session-intent.ts}

@@ -1,19 +1,19 @@
-// Guardian verification intent resolution for deterministic first-turn routing.
-// Exports `resolveGuardianVerificationIntent` as the single public entry point.
+// Verification session intent resolution for deterministic first-turn routing.
+// Exports `resolveVerificationSessionIntent` as the single public entry point.
 // When a direct guardian setup request is detected, the session pipeline
 // rewrites the message to force immediate entry into the guardian-verify-setup
 // skill flow, bypassing the normal agent loop's tendency to produce conceptual
 // preambles before loading the skill.
 
-export type GuardianVerificationIntentResult =
+export type VerificationSessionIntentResult =
   | { kind: "none" }
   | {
       kind: "direct_setup";
       rewrittenContent: string;
-      channelHint?: "voice" | "telegram" | "slack";
+      channelHint?: "phone" | "telegram" | "slack";
     };
 
-// ── Direct setup patterns ────────────────────────────────────────────────
+// -- Direct setup patterns ----------------------------------------------------
 // These capture imperative requests to start guardian verification.
 
 const DIRECT_SETUP_PATTERNS: RegExp[] = [
@@ -24,12 +24,12 @@ const DIRECT_SETUP_PATTERNS: RegExp[] = [
   /\bguardian\s+verif(?:y|ication)\s*(?:setup|set\s*up)?\b/i,
   /\bset\s*up\s+guardian\s+verif(?:y|ication)\b/i,
   /\b(?:help\s+me\s+)?set\s+(?:myself\s+)?(?:up\s+)?as\s+(?:your\s+)?guardian\s+(?:for|via|by|over|on|through)\s+/i,
-  /\bguardian\s+(?:for|via|by|over|on|through)\s+(?:sms|text|phone|voice|telegram|slack|call)\b/i,
+  /\bguardian\s+(?:for|via|by|over|on|through)\s+(?:text|phone|voice|telegram|slack|call)\b/i,
   /\bbecome\s+(?:your\s+|the\s+)?guardian\b/i,
   /\bregister\s+(?:me\s+)?as\s+(?:your\s+|the\s+)?guardian\b/i,
 ];
 
-// ── Conceptual / security question patterns ──────────────────────────────
+// -- Conceptual / security question patterns ----------------------------------
 // These indicate the user is asking *about* guardian verification
 // rather than requesting to start it. Return passthrough for these.
 
@@ -44,13 +44,13 @@ const CONCEPTUAL_PATTERNS: RegExp[] = [
   /\bcan\s+(?:you\s+)?(?:tell|explain|describe)\b/i,
 ];
 
-// ── Channel hint extraction ──────────────────────────────────────────────
+// -- Channel hint extraction --------------------------------------------------
 
 const CHANNEL_HINT_PATTERNS: Array<{
   pattern: RegExp;
-  channel: "voice" | "telegram" | "slack";
+  channel: "phone" | "telegram" | "slack";
 }> = [
-  { pattern: /\b(?:voice|call|phone\s*call|by\s+phone)\b/i, channel: "voice" },
+  { pattern: /\b(?:voice|call|phone\s*call|by\s+phone)\b/i, channel: "phone" },
   { pattern: /\btelegram\b/i, channel: "telegram" },
   { pattern: /\bslack\b/i, channel: "slack" },
 ];
@@ -59,7 +59,7 @@ const CHANNEL_HINT_PATTERNS: Array<{
 const FILLER_PATTERN =
   /\b(please|pls|plz|can\s+you|could\s+you|would\s+you|now|right\s+now|thanks|thank\s+you|thx|ty|for\s+me|ok(ay)?|hey|hi|hello|just|i\s+want\s+to|i'd\s+like\s+to|i\s+need\s+to|let's|let\s+me)\b/gi;
 
-// ── Internal helpers ─────────────────────────────────────────────────────
+// -- Internal helpers ---------------------------------------------------------
 
 function isConceptualQuestion(text: string): boolean {
   const cleaned = text.replace(/^\s*(hey|hi|hello|please|pls|plz)[,\s]+/i, "");
@@ -72,17 +72,17 @@ function isDirectSetupIntent(text: string): boolean {
 
 function extractChannelHint(
   text: string,
-): "voice" | "telegram" | "slack" | undefined {
+): "phone" | "telegram" | "slack" | undefined {
   for (const { pattern, channel } of CHANNEL_HINT_PATTERNS) {
     if (pattern.test(text)) return channel;
   }
   return undefined;
 }
 
-// ── Structured intent resolver ───────────────────────────────────────────
+// -- Structured intent resolver -----------------------------------------------
 
 /**
- * Resolves guardian verification intent from user text.
+ * Resolves verification session intent from user text.
  *
  * Pipeline:
  * 1. Skip slash commands entirely
@@ -90,9 +90,9 @@ function extractChannelHint(
  * 3. Detect direct setup patterns
  * 4. On match, build a deterministic model instruction to load guardian-verify-setup
  */
-export function resolveGuardianVerificationIntent(
+export function resolveVerificationSessionIntent(
   text: string,
-): GuardianVerificationIntentResult {
+): VerificationSessionIntentResult {
   const trimmed = text.trim();
 
   // Never intercept slash commands

package/src/daemon/watch-handler.ts

@@ -1,5 +1,3 @@
-import type * as net from "node:net";
-
 import {
   extractText,
   getConfiguredProvider,
@@ -16,8 +14,8 @@ import {
   watchSessions,
 } from "../tools/watch/watch-state.js";
 import { getLogger } from "../util/logger.js";
-import type { HandlerContext } from "./handlers.js";
-import type { WatchObservation } from "./ipc-protocol.js";
+import type { HandlerContext } from "./handlers/shared.js";
+import type { WatchObservation } from "./message-protocol.js";
 
 const log = getLogger("watch-handler");
 
@@ -30,7 +28,6 @@ export const lastSummaryBySession = new Map<string, string>();
 
 export async function handleWatchObservation(
   msg: WatchObservation,
-  _socket: net.Socket,
   _ctx: HandlerContext,
 ): Promise<void> {
   try {

package/src/email/service.ts

@@ -5,6 +5,13 @@
  * The CLI layer calls only this; never the provider directly.
  */
 
+import {
+  getNestedValue,
+  loadRawConfig,
+  saveRawConfig,
+  setNestedValue,
+} from "../config/loader.js";
+import { ConfigError } from "../util/errors.js";
 import {
   addAddressRule,
   type AddressRule,
@@ -15,14 +22,7 @@ import {
   removeAddressRule,
   setDailySendCap,
   setOutboundPaused,
-} from "../cli/email-guardrails.js";
-import {
-  getNestedValue,
-  loadRawConfig,
-  saveRawConfig,
-  setNestedValue,
-} from "../config/loader.js";
-import { ConfigError } from "../util/errors.js";
+} from "./guardrails.js";
 import type { EmailProvider } from "./provider.js";
 import {
   createProvider,

package/src/events/domain-events.ts

@@ -70,7 +70,6 @@ export interface ToolDomainEvents {
 export interface DaemonDomainEvents {
   "daemon.lifecycle.started": {
     pid: number;
-    socketPath: string;
     startedAtMs: number;
   };
   "daemon.lifecycle.stopped": {

package/src/events/tool-notification-listener.ts

@@ -1,4 +1,4 @@
-import type { ServerMessage } from "../daemon/ipc-protocol.js";
+import type { ServerMessage } from "../daemon/message-protocol.js";
 import type { EventBus, Subscription } from "./bus.js";
 import type { AssistantDomainEvents } from "./domain-events.js";
 

package/src/followups/followup-store.ts

@@ -18,7 +18,6 @@ function parseFollowUp(row: typeof followups.$inferSelect): FollowUp {
     expectedResponseBy: row.expectedResponseBy,
     status: row.status as FollowUpStatus,
     reminderScheduleId: scheduleId,
-    reminderCronId: scheduleId,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
   };
@@ -40,7 +39,7 @@ export function createFollowUp(input: FollowUpCreateInput): FollowUp {
       sentAt: input.sentAt ?? now,
       expectedResponseBy: input.expectedResponseBy ?? null,
       status: "pending",
-      reminderCronId: input.reminderScheduleId ?? input.reminderCronId ?? null,
+      reminderCronId: input.reminderScheduleId ?? null,
       createdAt: now,
       updatedAt: now,
     })

package/src/followups/types.ts

@@ -8,10 +8,7 @@ export interface FollowUp {
   sentAt: number;
   expectedResponseBy: number | null;
   status: FollowUpStatus;
-  /** Canonical field — the recurrence schedule ID linked to this follow-up. */
   reminderScheduleId: string | null;
-  /** @deprecated Use {@link reminderScheduleId}. Kept for migration compatibility. */
-  reminderCronId: string | null;
   createdAt: number;
   updatedAt: number;
 }
@@ -22,8 +19,5 @@ export interface FollowUpCreateInput {
   contactId?: string | null;
   sentAt?: number;
   expectedResponseBy?: number | null;
-  /** Canonical field — the recurrence schedule ID to link. */
   reminderScheduleId?: string | null;
-  /** @deprecated Use {@link reminderScheduleId}. Kept for migration compatibility. */
-  reminderCronId?: string | null;
 }

package/src/heartbeat/heartbeat-service.ts

@@ -1,5 +1,5 @@
 import { getConfig } from "../config/loader.js";
-import type { HeartbeatAlert } from "../daemon/ipc-contract.js";
+import type { HeartbeatAlert } from "../daemon/message-protocol.js";
 import { bootstrapConversation } from "../memory/conversation-bootstrap.js";
 import { readTextFileSync } from "../util/fs.js";
 import { getLogger } from "../util/logger.js";

package/src/inbound/platform-callback-registration.ts

@@ -52,7 +52,7 @@ interface RegisterCallbackRouteResponse {
  * @param callbackPath - The path portion after the ingress base URL
  *   (e.g. "webhooks/twilio/voice"). Leading/trailing slashes are stripped
  *   by the platform.
- * @param type - The route type identifier (e.g. "twilio_voice", "twilio_sms",
+ * @param type - The route type identifier (e.g. "twilio_voice",
  *   "twilio_status", "oauth", "telegram").
  * @returns The platform-provided callback URL that external services should use.
  * @throws If the platform request fails.

package/src/inbound/public-ingress-urls.ts

@@ -128,14 +128,6 @@ export function getOAuthCallbackUrl(config: IngressConfig): string {
   return `${base}/webhooks/oauth/callback`;
 }
 
-/**
- * Build the Twilio SMS webhook URL.
- */
-export function getTwilioSmsWebhookUrl(config: IngressConfig): string {
-  const base = getPublicBaseUrl(config);
-  return `${base}/webhooks/twilio/sms`;
-}
-
 /**
  * Build the Telegram webhook URL.
  */

package/src/index.ts

@@ -1,5 +1,17 @@
 #!/usr/bin/env bun
 
 import { buildCliProgram } from "./cli/program.js";
+import { resolveInstanceDataDir } from "./util/platform.js";
+
+// Auto-resolve BASE_DATA_DIR from the lockfile when running as a standalone CLI.
+// The daemon always has BASE_DATA_DIR set by the launcher (cli/src/lib/local.ts),
+// but the CLI process doesn't — so credential commands and other path-dependent
+// operations would read from ~/.vellum instead of the instance-scoped directory.
+if (!process.env.BASE_DATA_DIR) {
+  const instanceDir = resolveInstanceDataDir();
+  if (instanceDir) {
+    process.env.BASE_DATA_DIR = instanceDir;
+  }
+}
 
 buildCliProgram().parse();

package/src/mcp/client.ts

@@ -4,7 +4,7 @@ import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 
-import type { McpTransport } from "../config/mcp-schema.js";
+import type { McpTransport } from "../config/schemas/mcp.js";
 import { getSecureKeyAsync } from "../security/secure-keys.js";
 import { getLogger } from "../util/logger.js";
 import { McpOAuthProvider } from "./mcp-oauth-provider.js";

package/src/mcp/manager.ts

@@ -1,4 +1,4 @@
-import type { McpConfig, McpServerConfig } from "../config/mcp-schema.js";
+import type { McpConfig, McpServerConfig } from "../config/schemas/mcp.js";
 import { getLogger } from "../util/logger.js";
 import { McpClient, type McpToolInfo } from "./client.js";