@nuvin/nuvin-core 1.7.1 → 1.8.0

package/dist/VERSION

@@ -1,4 +1,4 @@
 {
-  "version": "1.7.1",
-  "commit": "c220b68"
+  "version": "1.8.0",
+  "commit": "da28f44"
 }

package/dist/index.d.ts

@@ -1905,6 +1905,54 @@ declare function okJson<T extends Record<string, unknown> | unknown[], M extends
 };
 declare function err(result: string, metadata?: Record<string, unknown>, errorReason?: ErrorReason): ExecResultError;
 
+type CommandSource = 'global' | 'profile' | 'local';
+interface CustomCommandTemplate {
+    id: string;
+    description: string;
+    prompt: string;
+    enabled?: boolean;
+    source: CommandSource;
+    filePath?: string;
+}
+interface CompleteCustomCommand extends CustomCommandTemplate {
+    id: string;
+    description: string;
+    prompt: string;
+    enabled: boolean;
+    source: CommandSource;
+    filePath: string;
+    shadowedBy?: CommandSource;
+}
+interface CustomCommandFrontmatter {
+    description: string;
+    enabled?: boolean;
+}
+declare function isValidCommandId(id: string): boolean;
+declare function sanitizeCommandId(name: string): string;
+
+interface CommandFilePersistenceOptions {
+    globalDir: string;
+    profileDir?: string;
+    localDir: string;
+}
+declare class CommandFilePersistence {
+    private globalDir;
+    private profileDir?;
+    private localDir;
+    constructor(options: CommandFilePersistenceOptions);
+    setProfileDir(profileDir: string | undefined): void;
+    getDir(source: CommandSource): string;
+    private ensureDir;
+    loadAll(): Promise<CustomCommandTemplate[]>;
+    private loadFromDir;
+    load(filename: string, source: CommandSource): Promise<CustomCommandTemplate | null>;
+    save(command: CustomCommandTemplate): Promise<void>;
+    delete(commandId: string, source: CommandSource): Promise<void>;
+    exists(commandId: string, source: CommandSource): boolean;
+    private parseFrontmatter;
+    private buildMarkdown;
+}
+
 /**
  * Sub-agent related types
  * These types track the state and execution of delegated specialist agents
@@ -2216,6 +2264,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[];
@@ -2225,11 +2276,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;
@@ -2249,4 +2303,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, 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, 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, CommandFilePersistence, type CommandMetadata, type CommandSource, type CompleteAgent, type CompleteCustomCommand, CompositeToolPort, type Conversation, ConversationContext, type ConversationMetadata, type ConversationSnapshot, ConversationStore, CoreMCPClient, type CustomCommandFrontmatter, type CustomCommandTemplate, 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, isValidCommandId, isWebFetchArgs, isWebFetchResult, isWebFetchSuccess, isWebSearchArgs, isWebSearchResult, isWebSearchSuccess, normalizeModelInfo, normalizeModelLimits, normalizeNewlines, okJson, okText, parseJSON, parseSubAgentToolCallArguments, parseToolArguments, renderTemplate, resolveBackspaces, resolveCarriageReturns, sanitizeCommandId, stripAnsiAndControls, supportsGetModels, toolValidators };

package/dist/index.js

@@ -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
@@ -4581,6 +4581,175 @@ var AgentFilePersistence = class {
   }
 };
 
+// src/command-file-persistence.ts
+import * as fs9 from "fs";
+import * as path8 from "path";
+import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
+
+// src/command-types.ts
+function isValidCommandId(id) {
+  return /^[a-z][a-z0-9-]*$/.test(id);
+}
+function sanitizeCommandId(name) {
+  return name.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+}
+
+// src/command-file-persistence.ts
+var CommandFilePersistence = class {
+  globalDir;
+  profileDir;
+  localDir;
+  constructor(options) {
+    this.globalDir = options.globalDir;
+    this.profileDir = options.profileDir;
+    this.localDir = options.localDir;
+  }
+  setProfileDir(profileDir) {
+    this.profileDir = profileDir;
+  }
+  getDir(source) {
+    switch (source) {
+      case "global":
+        return this.globalDir;
+      case "profile":
+        if (!this.profileDir) {
+          throw new Error("Profile directory not set");
+        }
+        return this.profileDir;
+      case "local":
+        return this.localDir;
+    }
+  }
+  ensureDir(dir) {
+    if (!fs9.existsSync(dir)) {
+      fs9.mkdirSync(dir, { recursive: true });
+    }
+  }
+  async loadAll() {
+    const commands = [];
+    const sources = ["global", "local"];
+    if (this.profileDir) {
+      sources.splice(1, 0, "profile");
+    }
+    for (const source of sources) {
+      try {
+        const dir = this.getDir(source);
+        const loaded = await this.loadFromDir(dir, source);
+        commands.push(...loaded);
+      } catch {
+      }
+    }
+    return commands;
+  }
+  async loadFromDir(dir, source) {
+    const commands = [];
+    if (!fs9.existsSync(dir)) {
+      return commands;
+    }
+    const files = fs9.readdirSync(dir);
+    const mdFiles = files.filter((f) => f.endsWith(".md"));
+    for (const file of mdFiles) {
+      try {
+        const command = await this.load(file, source);
+        if (command) {
+          commands.push(command);
+        }
+      } catch (error) {
+        console.warn(`Failed to load command from ${file}:`, error);
+      }
+    }
+    return commands;
+  }
+  async load(filename, source) {
+    try {
+      const dir = this.getDir(source);
+      const filePath = path8.join(dir, filename);
+      const content = fs9.readFileSync(filePath, "utf8");
+      const { frontmatter, body } = this.parseFrontmatter(content);
+      if (!frontmatter.description) {
+        console.warn(`Invalid command template in ${filename}: missing description`);
+        return null;
+      }
+      const id = path8.basename(filename, ".md");
+      return {
+        id,
+        description: frontmatter.description,
+        prompt: body.trim(),
+        enabled: frontmatter.enabled ?? true,
+        source,
+        filePath
+      };
+    } catch (error) {
+      console.warn(`Failed to load command from ${filename}:`, error);
+      return null;
+    }
+  }
+  async save(command) {
+    const dir = this.getDir(command.source);
+    this.ensureDir(dir);
+    const id = sanitizeCommandId(command.id);
+    const filename = `${id}.md`;
+    const filePath = path8.join(dir, filename);
+    const frontmatter = {
+      description: command.description
+    };
+    if (command.enabled === false) {
+      frontmatter.enabled = false;
+    }
+    const content = this.buildMarkdown(frontmatter, command.prompt);
+    fs9.writeFileSync(filePath, content, "utf8");
+  }
+  async delete(commandId, source) {
+    const dir = this.getDir(source);
+    const filename = `${sanitizeCommandId(commandId)}.md`;
+    const filePath = path8.join(dir, filename);
+    if (fs9.existsSync(filePath)) {
+      fs9.unlinkSync(filePath);
+    }
+  }
+  exists(commandId, source) {
+    try {
+      const dir = this.getDir(source);
+      const filename = `${sanitizeCommandId(commandId)}.md`;
+      const filePath = path8.join(dir, filename);
+      return fs9.existsSync(filePath);
+    } catch {
+      return false;
+    }
+  }
+  parseFrontmatter(content) {
+    const frontmatterRegex = /^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/;
+    const match = content.match(frontmatterRegex);
+    if (!match) {
+      return {
+        frontmatter: {},
+        body: content
+      };
+    }
+    try {
+      const frontmatter = parseYaml(match[1] || "");
+      return {
+        frontmatter: frontmatter || {},
+        body: match[2] || ""
+      };
+    } catch {
+      return {
+        frontmatter: {},
+        body: content
+      };
+    }
+  }
+  buildMarkdown(frontmatter, body) {
+    const yamlContent = stringifyYaml(frontmatter, { lineWidth: 0 }).trim();
+    return `---
+${yamlContent}
+---
+
+${body}
+`;
+  }
+};
+
 // src/sub-agent-types.ts
 function parseSubAgentToolCallArguments(argsString) {
   if (!argsString) return {};
@@ -5354,12 +5523,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",
       () => {
@@ -6730,71 +6899,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,
@@ -6806,6 +6910,7 @@ export {
   AgentRegistry,
   AnthropicAISDKLLM,
   BashTool,
+  CommandFilePersistence,
   CompositeToolPort,
   ConversationContext,
   ConversationStore,
@@ -6879,13 +6984,13 @@ export {
   isTodoWriteArgs,
   isTodoWriteResult,
   isTodoWriteSuccess,
+  isValidCommandId,
   isWebFetchArgs,
   isWebFetchResult,
   isWebFetchSuccess,
   isWebSearchArgs,
   isWebSearchResult,
   isWebSearchSuccess,
-  loadMCPConfig,
   normalizeModelInfo,
   normalizeModelLimits,
   normalizeNewlines,
@@ -6897,6 +7002,7 @@ export {
   renderTemplate,
   resolveBackspaces,
   resolveCarriageReturns,
+  sanitizeCommandId,
   stripAnsiAndControls,
   supportsGetModels,
   toolValidators

package/package.json

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