@nuvin/nuvin-core 1.7.0 → 1.7.2

package/dist/VERSION

@@ -1,4 +1,4 @@
 {
-  "version": "1.7.0",
-  "commit": "4c993c8"
+  "version": "1.7.2",
+  "commit": "9570da1"
 }

package/dist/index.d.ts

@@ -2059,12 +2059,15 @@ type ModelInfo = {
     id: string;
     name?: string;
     limits?: ModelLimits;
-    [key: string]: unknown;
+    [key: string]: string | number | ModelLimits | undefined | unknown;
+};
+type RawModelResponse = {
+    [key: string]: string | number | undefined | unknown;
 };
-type RawModelResponse = Record<string, unknown>;
 declare function normalizeModelLimits(provider: string, model: RawModelResponse): ModelLimits | null;
 declare function getFallbackLimits(provider: string, model: string): ModelLimits | null;
 declare function normalizeModelInfo(provider: string, model: RawModelResponse): ModelInfo;
+declare function deduplicateModels(models: ModelInfo[]): ModelInfo[];
 
 type GithubOptions = {
     apiKey?: string;
@@ -2213,6 +2216,9 @@ declare class MCPToolPort implements ToolPort {
     executeToolCalls(calls: ToolInvocation[], _context?: Record<string, unknown>, maxConcurrent?: number, signal?: AbortSignal): Promise<ToolExecutionResult[]>;
 }
 
+/**
+ * @deprecated Use MCPServerConfig from nuvin-cli/config/types.ts instead
+ */
 type MCPServerConfig = {
     command?: string;
     args?: string[];
@@ -2222,11 +2228,14 @@ type MCPServerConfig = {
     headers?: Record<string, string>;
     prefix?: string;
     timeoutMs?: number;
+    enabled?: boolean;
 };
+/**
+ * @deprecated MCP config is now part of main CLI config under mcp.servers
+ */
 type MCPConfig = {
     mcpServers: Record<string, MCPServerConfig>;
 };
-declare function loadMCPConfig(filePath?: string): Promise<MCPConfig | null>;
 
 declare class PersistingConsoleEventPort implements EventPort {
     private memory;
@@ -2246,4 +2255,4 @@ declare function resolveBackspaces(s: string): string;
 declare function stripAnsiAndControls(s: string): string;
 declare function canonicalizeTerminalPaste(raw: string): string;
 
-export { AGENT_CREATOR_SYSTEM_PROMPT, AbortError, type AgentAwareToolPort, type AgentCatalog, type AgentConfig, type AgentEvent, AgentEventTypes, AgentFilePersistence, AgentManager, AgentManagerCommandRunner, AgentOrchestrator, AgentRegistry, type AgentTemplate, AnthropicAISDKLLM, type AssignErrorResult, type AssignParams, type AssignResult, type AssignSuccessResult$1 as AssignSuccessResult, type AssignTaskArgs, type AssignTaskMetadata, type BaseLLMOptions, type BashErrorResult, type BashParams, type BashResult, type BashSuccessResult$1 as BashSuccessResult, BashTool, type BashToolArgs, type BashToolMetadata, type CommandMetadata, type CompleteAgent, CompositeToolPort, type Conversation, ConversationContext, type ConversationMetadata, type ConversationSnapshot, ConversationStore, CoreMCPClient, DEFAULT_RETRY_CONFIG, DefaultDelegationPolicy, DefaultDelegationResultFormatter, DefaultDelegationService, DefaultSpecialistAgentFactory, type DelegationMetadata, type DelegationService, type DelegationServiceConfig, DelegationServiceFactory, type DirEntry, type DirLsArgs, type DirLsMetadata, type DirLsParams, type DirLsResult, type DirLsSuccessResult$1 as DirLsSuccessResult, type ErrorMetadata, ErrorReason, type ExecResult, type ExecResultError, type ExecResultSuccess, type FileEditArgs, type FileEditMetadata, type FileEditResult, type FileEditSuccessResult$1 as FileEditSuccessResult, type FileMetadata, type FileNewArgs, type FileNewMetadata, type FileNewParams, type FileNewResult, type FileNewSuccessResult$1 as FileNewSuccessResult, type FileReadArgs, type FileReadErrorResult, type FileReadMetadata, type FileReadParams, type FileReadResult, type FileReadSuccessResult$1 as FileReadSuccessResult, type FolderTreeOptions, type FunctionTool, GithubLLM, InMemoryMemory, InMemoryMetadata, InMemoryMetricsPort, JsonFileMemoryPersistence, type LLMConfig, LLMError, type LLMFactory, type LLMOptions, type LLMPort, LLMResolver, type LineRangeMetadata, type MCPConfig, type MCPServerConfig, MCPToolPort, type MemoryPort, MemoryPortMetadataAdapter, type Message, type MessageContent, type MessageContentPart, type MetadataPort, type MetricsChangeHandler, type MetricsPort, type MetricsSnapshot, type ModelInfo, type ModelLimits, NoopMetricsPort, NoopReminders, type OrchestratorAwareToolPort, type ParseResult, PersistedMemory, PersistingConsoleEventPort, type RetryConfig, RetryTransport, RuntimeEnv, type SendMessageOptions, SimpleContextBuilder, SimpleCost, SimpleId, type SpecialistAgentConfig, type SpecialistAgentResult, type SubAgentState, type SubAgentToolCall, SystemClock, type TodoWriteArgs, type TodoWriteMetadata, type TodoWriteResult, type TodoWriteSuccessResult$1 as TodoWriteSuccessResult, type ToolApprovalDecision, type ToolArguments, type ToolCall, type ToolCallValidation, type ToolErrorMetadata, type ToolExecutionContext, type ToolExecutionResult, type ToolMetadataMap, type ToolName, type ToolParameterMap, type ToolPort, ToolRegistry, type ToolValidator, type TypedToolInvocation, type UsageData, type UserAttachment, type UserMessagePayload, type ValidationResult, type WebFetchArgs, type WebFetchMetadata, type WebFetchParams, type WebFetchResult, type WebFetchSuccessResult$1 as WebFetchSuccessResult, type WebSearchArgs, type WebSearchMetadata, type WebSearchParams, type WebSearchResult, type WebSearchSuccessResult$1 as WebSearchSuccessResult, type WebSearchToolResult, buildAgentCreationPrompt, buildInjectedSystem, canonicalizeTerminalPaste, convertToolCall, convertToolCalls, createEmptySnapshot, createLLM, err, generateFolderTree, getAvailableProviders, getFallbackLimits, getProviderLabel, isAssignResult, isAssignSuccess, isAssignTaskArgs, isBashResult, isBashSuccess, isBashToolArgs, isDirLsArgs, isDirLsResult, isDirLsSuccess, isError, isFileEditArgs, isFileEditResult, isFileEditSuccess, isFileNewArgs, isFileNewResult, isFileNewSuccess, isFileReadArgs, isFileReadResult, isFileReadSuccess, isJsonResult, isRetryableError, isRetryableStatusCode, isSuccess, isSuccessJson, isSuccessText, isTextResult, isTodoWriteArgs, isTodoWriteResult, isTodoWriteSuccess, isWebFetchArgs, isWebFetchResult, isWebFetchSuccess, isWebSearchArgs, isWebSearchResult, isWebSearchSuccess, loadMCPConfig, normalizeModelInfo, normalizeModelLimits, normalizeNewlines, okJson, okText, parseJSON, parseSubAgentToolCallArguments, parseToolArguments, renderTemplate, resolveBackspaces, resolveCarriageReturns, stripAnsiAndControls, supportsGetModels, toolValidators };
+export { AGENT_CREATOR_SYSTEM_PROMPT, AbortError, type AgentAwareToolPort, type AgentCatalog, type AgentConfig, type AgentEvent, AgentEventTypes, AgentFilePersistence, AgentManager, AgentManagerCommandRunner, AgentOrchestrator, AgentRegistry, type AgentTemplate, AnthropicAISDKLLM, type AssignErrorResult, type AssignParams, type AssignResult, type AssignSuccessResult$1 as AssignSuccessResult, type AssignTaskArgs, type AssignTaskMetadata, type BaseLLMOptions, type BashErrorResult, type BashParams, type BashResult, type BashSuccessResult$1 as BashSuccessResult, BashTool, type BashToolArgs, type BashToolMetadata, type CommandMetadata, type CompleteAgent, CompositeToolPort, type Conversation, ConversationContext, type ConversationMetadata, type ConversationSnapshot, ConversationStore, CoreMCPClient, DEFAULT_RETRY_CONFIG, DefaultDelegationPolicy, DefaultDelegationResultFormatter, DefaultDelegationService, DefaultSpecialistAgentFactory, type DelegationMetadata, type DelegationService, type DelegationServiceConfig, DelegationServiceFactory, type DirEntry, type DirLsArgs, type DirLsMetadata, type DirLsParams, type DirLsResult, type DirLsSuccessResult$1 as DirLsSuccessResult, type ErrorMetadata, ErrorReason, type ExecResult, type ExecResultError, type ExecResultSuccess, type FileEditArgs, type FileEditMetadata, type FileEditResult, type FileEditSuccessResult$1 as FileEditSuccessResult, type FileMetadata, type FileNewArgs, type FileNewMetadata, type FileNewParams, type FileNewResult, type FileNewSuccessResult$1 as FileNewSuccessResult, type FileReadArgs, type FileReadErrorResult, type FileReadMetadata, type FileReadParams, type FileReadResult, type FileReadSuccessResult$1 as FileReadSuccessResult, type FolderTreeOptions, type FunctionTool, GithubLLM, InMemoryMemory, InMemoryMetadata, InMemoryMetricsPort, JsonFileMemoryPersistence, type LLMConfig, LLMError, type LLMFactory, type LLMOptions, type LLMPort, LLMResolver, type LineRangeMetadata, type MCPConfig, type MCPServerConfig, MCPToolPort, type MemoryPort, MemoryPortMetadataAdapter, type Message, type MessageContent, type MessageContentPart, type MetadataPort, type MetricsChangeHandler, type MetricsPort, type MetricsSnapshot, type ModelInfo, type ModelLimits, NoopMetricsPort, NoopReminders, type OrchestratorAwareToolPort, type ParseResult, PersistedMemory, PersistingConsoleEventPort, type RetryConfig, RetryTransport, RuntimeEnv, type SendMessageOptions, SimpleContextBuilder, SimpleCost, SimpleId, type SpecialistAgentConfig, type SpecialistAgentResult, type SubAgentState, type SubAgentToolCall, SystemClock, type TodoWriteArgs, type TodoWriteMetadata, type TodoWriteResult, type TodoWriteSuccessResult$1 as TodoWriteSuccessResult, type ToolApprovalDecision, type ToolArguments, type ToolCall, type ToolCallValidation, type ToolErrorMetadata, type ToolExecutionContext, type ToolExecutionResult, type ToolMetadataMap, type ToolName, type ToolParameterMap, type ToolPort, ToolRegistry, type ToolValidator, type TypedToolInvocation, type UsageData, type UserAttachment, type UserMessagePayload, type ValidationResult, type WebFetchArgs, type WebFetchMetadata, type WebFetchParams, type WebFetchResult, type WebFetchSuccessResult$1 as WebFetchSuccessResult, type WebSearchArgs, type WebSearchMetadata, type WebSearchParams, type WebSearchResult, type WebSearchSuccessResult$1 as WebSearchSuccessResult, type WebSearchToolResult, buildAgentCreationPrompt, buildInjectedSystem, canonicalizeTerminalPaste, convertToolCall, convertToolCalls, createEmptySnapshot, createLLM, deduplicateModels, err, generateFolderTree, getAvailableProviders, getFallbackLimits, getProviderLabel, isAssignResult, isAssignSuccess, isAssignTaskArgs, isBashResult, isBashSuccess, isBashToolArgs, isDirLsArgs, isDirLsResult, isDirLsSuccess, isError, isFileEditArgs, isFileEditResult, isFileEditSuccess, isFileNewArgs, isFileNewResult, isFileNewSuccess, isFileReadArgs, isFileReadResult, isFileReadSuccess, isJsonResult, isRetryableError, isRetryableStatusCode, isSuccess, isSuccessJson, isSuccessText, isTextResult, isTodoWriteArgs, isTodoWriteResult, isTodoWriteSuccess, isWebFetchArgs, isWebFetchResult, isWebFetchSuccess, isWebSearchArgs, isWebSearchResult, isWebSearchSuccess, normalizeModelInfo, normalizeModelLimits, normalizeNewlines, okJson, okText, parseJSON, parseSubAgentToolCallArguments, parseToolArguments, renderTemplate, resolveBackspaces, resolveCarriageReturns, stripAnsiAndControls, supportsGetModels, toolValidators };

package/dist/index.js

@@ -268,9 +268,9 @@ var JsonFileMemoryPersistence = class {
   }
   async load() {
     try {
-      const fs10 = await import("fs");
-      if (!fs10.existsSync(this.filename)) return {};
-      const text = fs10.readFileSync(this.filename, "utf-8");
+      const fs9 = await import("fs");
+      if (!fs9.existsSync(this.filename)) return {};
+      const text = fs9.readFileSync(this.filename, "utf-8");
       const data = JSON.parse(text);
       return typeof data === "object" && data ? data : {};
     } catch {
@@ -280,13 +280,13 @@ var JsonFileMemoryPersistence = class {
   }
   async save(snapshot) {
     try {
-      const fs10 = await import("fs");
-      const path9 = await import("path");
-      const dir = path9.dirname(this.filename);
-      if (dir && dir !== "." && !fs10.existsSync(dir)) {
-        fs10.mkdirSync(dir, { recursive: true });
+      const fs9 = await import("fs");
+      const path8 = await import("path");
+      const dir = path8.dirname(this.filename);
+      if (dir && dir !== "." && !fs9.existsSync(dir)) {
+        fs9.mkdirSync(dir, { recursive: true });
       }
-      fs10.writeFileSync(this.filename, JSON.stringify(snapshot, null, 2), "utf-8");
+      fs9.writeFileSync(this.filename, JSON.stringify(snapshot, null, 2), "utf-8");
     } catch (err2) {
       console.warn(`Failed to save memory to ${this.filename}`, err2);
     }
@@ -1361,8 +1361,8 @@ var AgentOrchestrator = class {
   }
   async waitForToolApproval(toolCalls, conversationId, messageId) {
     const approvalId = this.ids.uuid();
-    return new Promise((resolve6, reject) => {
-      this.pendingApprovals.set(approvalId, { resolve: resolve6, reject });
+    return new Promise((resolve5, reject) => {
+      this.pendingApprovals.set(approvalId, { resolve: resolve5, reject });
       this.events?.emit({
         type: AgentEventTypes.ToolApprovalRequired,
         conversationId,
@@ -3344,14 +3344,14 @@ var AgentRegistry = class {
    * Load agents from both persistence and files
    */
   async loadAgents() {
-    const promises2 = [];
+    const promises = [];
     if (this.persistence) {
-      promises2.push(this.loadFromPersistence());
+      promises.push(this.loadFromPersistence());
     }
     if (this.filePersistence) {
-      promises2.push(this.loadFromFiles());
+      promises.push(this.loadFromFiles());
     }
-    await Promise.all(promises2);
+    await Promise.all(promises);
   }
   /**
    * Wait for all agents to finish loading
@@ -4917,21 +4917,21 @@ var NetworkLogger = class {
   async appendToLogFile(entry) {
     if (!this.opts.persistFile) return;
     try {
-      const fs10 = await import("fs/promises");
-      const path9 = await import("path");
+      const fs9 = await import("fs/promises");
+      const path8 = await import("path");
       const file = this.opts.persistFile;
-      const dir = path9.dirname(file);
+      const dir = path8.dirname(file);
       if (dir && dir !== ".") {
         try {
-          await fs10.mkdir(dir, { recursive: true });
+          await fs9.mkdir(dir, { recursive: true });
         } catch {
         }
       }
       const logLine = this.formatLogEntry(entry);
-      await fs10.appendFile(file, `${logLine}
+      await fs9.appendFile(file, `${logLine}
 `, "utf-8");
       if (this.opts.maxFileSize) {
-        const stats = await fs10.stat(file);
+        const stats = await fs9.stat(file);
         if (stats.size > this.opts.maxFileSize) {
           await this.rotateLogFile(file);
         }
@@ -4951,9 +4951,9 @@ var NetworkLogger = class {
   }
   async rotateLogFile(file) {
     try {
-      const fs10 = await import("fs/promises");
+      const fs9 = await import("fs/promises");
       const rotatedFile = `${file}.${Date.now()}`;
-      await fs10.rename(file, rotatedFile);
+      await fs9.rename(file, rotatedFile);
     } catch {
     }
   }
@@ -5180,12 +5180,12 @@ var GithubAuthTransport = class {
       this.dynamicApiUrl = data.endpoints.api;
     }
   }
-  buildFullUrl(path9) {
-    if (path9.startsWith("/")) {
+  buildFullUrl(path8) {
+    if (path8.startsWith("/")) {
       const apiUrl = this.dynamicApiUrl ?? this.baseUrl;
-      return `${apiUrl}${path9}`;
+      return `${apiUrl}${path8}`;
     }
-    return path9;
+    return path8;
   }
   hasVisionPayload(body) {
     if (!body || typeof body !== "object") return false;
@@ -5354,12 +5354,12 @@ var AbortError = class _AbortError extends Error {
   }
 };
 var sleep = (ms, signal) => {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve5, reject) => {
     if (signal?.aborted) {
       reject(new AbortError("Operation aborted"));
       return;
     }
-    const timeout = setTimeout(resolve6, ms);
+    const timeout = setTimeout(resolve5, ms);
     signal?.addEventListener(
       "abort",
       () => {
@@ -5539,11 +5539,11 @@ var AnthropicAuthTransport = class {
       this.refreshPromise = null;
     }
   }
-  buildFullUrl(path9) {
-    if (path9.startsWith("/")) {
-      return `${this.baseUrl}${path9}`;
+  buildFullUrl(path8) {
+    if (path8.startsWith("/")) {
+      return `${this.baseUrl}${path8}`;
     }
-    return path9;
+    return path8;
   }
   makeAuthHeaders(headers) {
     const base = {
@@ -5650,11 +5650,11 @@ var BaseBearerAuthTransport = class {
     this.version = version;
     this.customHeaders = customHeaders;
   }
-  buildFullUrl(path9) {
-    if (path9.startsWith("/")) {
-      return `${this.baseUrl}${path9}`;
+  buildFullUrl(path8) {
+    if (path8.startsWith("/")) {
+      return `${this.baseUrl}${path8}`;
     }
-    return path9;
+    return path8;
   }
   makeAuthHeaders(headers) {
     const base = headers ? { ...headers } : {};
@@ -5808,6 +5808,15 @@ function normalizeModelInfo(provider, model) {
     ...limits ? { limits } : {}
   };
 }
+function deduplicateModels(models) {
+  const uniqueModels = /* @__PURE__ */ new Map();
+  for (const model of models) {
+    if (!uniqueModels.has(model.id)) {
+      uniqueModels.set(model.id, model);
+    }
+  }
+  return Array.from(uniqueModels.values());
+}
 
 // src/llm-providers/llm-github.ts
 var GithubLLM = class extends BaseLLM {
@@ -5852,7 +5861,8 @@ var GithubLLM = class extends BaseLLM {
       throw new LLMError(text || `Failed to fetch models: ${res.status}`, res.status);
     }
     const body = await res.json();
-    return body.data.map((m) => normalizeModelInfo("github", m));
+    const models = body.data.map((m) => normalizeModelInfo("github", m));
+    return deduplicateModels(models);
   }
   handleError(error, model) {
     if (error instanceof LLMError) {
@@ -6289,7 +6299,8 @@ var AnthropicAISDKLLM = class {
         throw new LLMError(text || `Failed to fetch models: ${res.status}`, res.status);
       }
       const data = await res.json();
-      return data.data.map((model) => normalizeModelInfo("anthropic", model));
+      const models = data.data.map((model) => normalizeModelInfo("anthropic", model));
+      return deduplicateModels(models);
     } catch (error) {
       if (error instanceof LLMError) {
         throw error;
@@ -6399,10 +6410,11 @@ var GenericLLM = class extends BaseLLM {
       throw new Error("Provider does not support getModels");
     }
     if (Array.isArray(this.modelConfig)) {
-      return this.modelConfig.map((m) => {
+      const models2 = this.modelConfig.map((m) => {
         const raw = typeof m === "string" ? { id: m } : m;
         return normalizeModelInfo(this.providerName, raw);
       });
+      return deduplicateModels(models2);
     }
     if (typeof this.modelConfig === "string") {
       const transport2 = this.createTransport();
@@ -6412,7 +6424,8 @@ var GenericLLM = class extends BaseLLM {
         throw new Error(`Failed to fetch models: ${res2.status} ${text}`);
       }
       const data2 = await res2.json();
-      return data2.data.map((m) => normalizeModelInfo(this.providerName, m));
+      const models2 = data2.data.map((m) => normalizeModelInfo(this.providerName, m));
+      return deduplicateModels(models2);
     }
     const transport = this.createTransport();
     const res = await transport.get("/models", void 0, signal);
@@ -6421,7 +6434,8 @@ var GenericLLM = class extends BaseLLM {
       throw new Error(`Failed to fetch models: ${res.status} ${text}`);
     }
     const data = await res.json();
-    return data.data.map((m) => normalizeModelInfo(this.providerName, m));
+    const models = data.data.map((m) => normalizeModelInfo(this.providerName, m));
+    return deduplicateModels(models);
   }
   async generateCompletion(params, signal) {
     let enhancedParams = params;
@@ -6716,71 +6730,6 @@ var MCPToolPort = class {
     return results;
   }
 };
-
-// src/config.ts
-import * as fs9 from "fs";
-import * as path8 from "path";
-import { parse as parseYaml } from "yaml";
-async function loadMCPConfig(filePath = ".nuvin_mcp.json") {
-  try {
-    const resolvedPath = path8.resolve(filePath);
-    if (!fs9.existsSync(resolvedPath)) {
-      return null;
-    }
-    const raw = await fs9.promises.readFile(resolvedPath, "utf-8");
-    if (!raw.trim()) {
-      return null;
-    }
-    const ext = path8.extname(resolvedPath).toLowerCase();
-    let data;
-    if (ext === ".yaml" || ext === ".yml") {
-      data = parseYaml(raw);
-    } else {
-      data = JSON.parse(raw);
-    }
-    return normalizeMCPConfig(data);
-  } catch (error) {
-    console.warn(`Failed to load MCP config from ${filePath}:`, error);
-    return null;
-  }
-}
-function normalizeMCPConfig(raw) {
-  if (!raw || typeof raw !== "object") {
-    return null;
-  }
-  const asRecord = raw;
-  if (isValidConfig(asRecord)) {
-    const servers = asRecord.mcpServers;
-    if (servers && typeof servers === "object" && !Array.isArray(servers)) {
-      return { mcpServers: servers };
-    }
-  }
-  if ("config" in asRecord && asRecord.config && typeof asRecord.config === "object") {
-    const nested = asRecord.config;
-    if (isValidConfig(nested)) {
-      const servers = nested.mcpServers;
-      if (servers && typeof servers === "object" && !Array.isArray(servers)) {
-        return { mcpServers: servers };
-      }
-    }
-  }
-  return null;
-}
-function isValidConfig(value) {
-  if (!("mcpServers" in value)) {
-    return false;
-  }
-  const servers = value.mcpServers;
-  if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
-    return false;
-  }
-  for (const server of Object.values(servers)) {
-    if (!server || typeof server !== "object" || Array.isArray(server)) {
-      return false;
-    }
-  }
-  return true;
-}
 export {
   AGENT_CREATOR_SYSTEM_PROMPT,
   AbortError,
@@ -6830,6 +6779,7 @@ export {
   convertToolCalls,
   createEmptySnapshot,
   createLLM,
+  deduplicateModels,
   err,
   generateFolderTree,
   getAvailableProviders,
@@ -6870,7 +6820,6 @@ export {
   isWebSearchArgs,
   isWebSearchResult,
   isWebSearchSuccess,
-  loadMCPConfig,
   normalizeModelInfo,
   normalizeModelLimits,
   normalizeNewlines,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuvin/nuvin-core",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "",
   "private": false,
   "main": "dist/index.js",