apteva 0.2.10 → 0.3.6

package/src/db.ts

@@ -5,6 +5,19 @@ import { encrypt, decrypt, encryptObject, decryptObject } from "./crypto";
 import { randomBytes } from "crypto";
 
 // Types
+export type AgentMode = "coordinator" | "worker";
+
+export interface MultiAgentConfig {
+  enabled: boolean;
+  mode?: AgentMode;
+  group?: string; // Defaults to projectId if not specified
+}
+
+export interface AgentBuiltinTools {
+  webSearch: boolean;
+  webFetch: boolean;
+}
+
 export interface AgentFeatures {
   memory: boolean;
   tasks: boolean;
@@ -13,7 +26,8 @@ export interface AgentFeatures {
   mcp: boolean;
   realtime: boolean;
   files: boolean;
-  agents: boolean;
+  agents: boolean | MultiAgentConfig; // Can be boolean for backwards compat or full config
+  builtinTools?: AgentBuiltinTools;
 }
 
 export const DEFAULT_FEATURES: AgentFeatures = {
@@ -25,8 +39,25 @@ export const DEFAULT_FEATURES: AgentFeatures = {
   realtime: false,
   files: false,
   agents: false,
+  builtinTools: { webSearch: false, webFetch: false },
 };
 
+// Helper to normalize agents feature to MultiAgentConfig
+export function getMultiAgentConfig(features: AgentFeatures, projectId?: string | null): MultiAgentConfig {
+  const agents = features.agents;
+  if (typeof agents === "boolean") {
+    return {
+      enabled: agents,
+      mode: "worker",
+      group: projectId || undefined,
+    };
+  }
+  return {
+    ...agents,
+    group: agents.group || projectId || undefined,
+  };
+}
+
 export interface Agent {
   id: string;
   name: string;
@@ -37,6 +68,7 @@ export interface Agent {
   port: number | null;
   features: AgentFeatures;
   mcp_servers: string[]; // Array of MCP server IDs
+  skills: string[]; // Array of Skill IDs
   project_id: string | null; // Optional project grouping
   api_key_encrypted: string | null; // Encrypted API key for agent authentication
   created_at: string;
@@ -71,6 +103,7 @@ export interface AgentRow {
   port: number | null;
   features: string | null;
   mcp_servers: string | null;
+  skills: string | null;
   project_id: string | null;
   api_key_encrypted: string | null;
   created_at: string;
@@ -105,8 +138,9 @@ export interface ProviderKeyRow {
 export interface McpServer {
   id: string;
   name: string;
-  type: "npm" | "github" | "http" | "custom";
-  package: string | null;
+  type: "npm" | "pip" | "github" | "http" | "custom";
+  package: string | null;       // npm or pip package name
+  pip_module: string | null;    // For pip type: the module to run (e.g., "late.mcp")
   command: string | null;
   args: string | null;
   env: Record<string, string>;
@@ -115,14 +149,53 @@ export interface McpServer {
   port: number | null;
   status: "stopped" | "running";
   source: string | null; // e.g., "composio", "smithery", null for local
+  project_id: string | null; // null = global, otherwise project-scoped
   created_at: string;
 }
 
+// Skill types
+export interface Skill {
+  id: string;
+  name: string;
+  description: string;
+  content: string; // Full SKILL.md body (markdown)
+  version: string; // Semantic version (e.g., "1.0.0")
+  license: string | null;
+  compatibility: string | null;
+  metadata: Record<string, string>;
+  allowed_tools: string[];
+  source: "local" | "skillsmp" | "github" | "import";
+  source_url: string | null;
+  enabled: boolean;
+  project_id: string | null; // null = global, otherwise project-scoped
+  created_at: string;
+  updated_at: string;
+}
+
+export interface SkillRow {
+  id: string;
+  name: string;
+  description: string;
+  content: string;
+  version: string;
+  license: string | null;
+  compatibility: string | null;
+  metadata: string | null;
+  allowed_tools: string | null;
+  source: string;
+  source_url: string | null;
+  enabled: number;
+  project_id: string | null;
+  created_at: string;
+  updated_at: string;
+}
+
 export interface McpServerRow {
   id: string;
   name: string;
   type: string;
   package: string | null;
+  pip_module: string | null;
   command: string | null;
   args: string | null;
   env: string | null;
@@ -131,6 +204,7 @@ export interface McpServerRow {
   port: number | null;
   status: string;
   source: string | null;
+  project_id: string | null;
   created_at: string;
 }
 
@@ -371,6 +445,61 @@ function runMigrations() {
         ALTER TABLE agents ADD COLUMN api_key_encrypted TEXT;
       `,
     },
+    {
+      name: "016_create_skills",
+      sql: `
+        CREATE TABLE IF NOT EXISTS skills (
+          id TEXT PRIMARY KEY,
+          name TEXT NOT NULL,
+          description TEXT NOT NULL,
+          content TEXT NOT NULL,
+          license TEXT,
+          compatibility TEXT,
+          metadata TEXT DEFAULT '{}',
+          allowed_tools TEXT DEFAULT '[]',
+          source TEXT NOT NULL DEFAULT 'local',
+          source_url TEXT,
+          enabled INTEGER DEFAULT 1,
+          created_at TEXT NOT NULL DEFAULT (datetime('now')),
+          updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+        );
+        CREATE INDEX IF NOT EXISTS idx_skills_name ON skills(name);
+        CREATE INDEX IF NOT EXISTS idx_skills_source ON skills(source);
+        CREATE INDEX IF NOT EXISTS idx_skills_enabled ON skills(enabled);
+      `,
+    },
+    {
+      name: "017_add_skills_to_agents",
+      sql: `
+        ALTER TABLE agents ADD COLUMN skills TEXT DEFAULT '[]';
+      `,
+    },
+    {
+      name: "018_add_skill_version",
+      sql: `
+        ALTER TABLE skills ADD COLUMN version TEXT DEFAULT '1.0.0';
+      `,
+    },
+    {
+      name: "019_add_mcp_server_project_id",
+      sql: `
+        ALTER TABLE mcp_servers ADD COLUMN project_id TEXT REFERENCES projects(id) ON DELETE SET NULL;
+        CREATE INDEX IF NOT EXISTS idx_mcp_servers_project ON mcp_servers(project_id);
+      `,
+    },
+    {
+      name: "020_add_skill_project_id",
+      sql: `
+        ALTER TABLE skills ADD COLUMN project_id TEXT REFERENCES projects(id) ON DELETE SET NULL;
+        CREATE INDEX IF NOT EXISTS idx_skills_project ON skills(project_id);
+      `,
+    },
+    {
+      name: "021_add_mcp_server_pip_module",
+      sql: `
+        ALTER TABLE mcp_servers ADD COLUMN pip_module TEXT;
+      `,
+    },
   ];
 
   // Check which migrations have been applied
@@ -383,9 +512,20 @@ function runMigrations() {
   // Run pending migrations
   for (const migration of migrations) {
     if (!applied.has(migration.name)) {
-      // Migration runs silently
-      db.run(migration.sql);
-      db.run("INSERT INTO migrations (name) VALUES (?)", [migration.name]);
+      try {
+        // Migration runs silently
+        db.run(migration.sql);
+        db.run("INSERT INTO migrations (name) VALUES (?)", [migration.name]);
+      } catch (err) {
+        // Log error but continue - some migrations may fail if partially applied
+        console.error(`[db] Migration ${migration.name} failed:`, err);
+        // Still mark as applied to avoid retrying broken migrations
+        try {
+          db.run("INSERT INTO migrations (name) VALUES (?)", [migration.name]);
+        } catch {
+          // Ignore if already marked
+        }
+      }
     }
   }
 
@@ -464,16 +604,17 @@ export const AgentDB = {
     const now = new Date().toISOString();
     const featuresJson = JSON.stringify(agent.features || DEFAULT_FEATURES);
     const mcpServersJson = JSON.stringify(agent.mcp_servers || []);
+    const skillsJson = JSON.stringify(agent.skills || []);
     // Assign port permanently at creation time
     const port = agent.port ?? this.getNextAvailablePort();
     // Generate and encrypt API key
     const apiKey = generateAgentApiKey(agent.id);
     const apiKeyEncrypted = encrypt(apiKey);
     const stmt = db.prepare(`
-      INSERT INTO agents (id, name, model, provider, system_prompt, features, mcp_servers, project_id, status, port, api_key_encrypted, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'stopped', ?, ?, ?, ?)
+      INSERT INTO agents (id, name, model, provider, system_prompt, features, mcp_servers, skills, project_id, status, port, api_key_encrypted, created_at, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'stopped', ?, ?, ?, ?)
     `);
-    stmt.run(agent.id, agent.name, agent.model, agent.provider, agent.system_prompt, featuresJson, mcpServersJson, agent.project_id || null, port, apiKeyEncrypted, now, now);
+    stmt.run(agent.id, agent.name, agent.model, agent.provider, agent.system_prompt, featuresJson, mcpServersJson, skillsJson, agent.project_id || null, port, apiKeyEncrypted, now, now);
     return this.findById(agent.id)!;
   },
 
@@ -535,6 +676,10 @@ export const AgentDB = {
       fields.push("mcp_servers = ?");
       values.push(JSON.stringify(updates.mcp_servers));
     }
+    if (updates.skills !== undefined) {
+      fields.push("skills = ?");
+      values.push(JSON.stringify(updates.skills));
+    }
     if (updates.project_id !== undefined) {
       fields.push("project_id = ?");
       values.push(updates.project_id);
@@ -561,6 +706,15 @@ export const AgentDB = {
     return rows.map(rowToAgent);
   },
 
+  // Find agents that have a specific skill
+  findBySkill(skillId: string): Agent[] {
+    // SQLite JSON query: check if skills array contains the skillId
+    const rows = db.query(
+      `SELECT * FROM agents WHERE skills LIKE ? ORDER BY created_at DESC`
+    ).all(`%"${skillId}"%`) as AgentRow[];
+    return rows.map(rowToAgent);
+  },
+
   // Delete agent
   delete(id: string): boolean {
     const result = db.run("DELETE FROM agents WHERE id = ?", [id]);
@@ -711,11 +865,12 @@ export const ProjectDB = {
     return row.count;
   },
 
-  // Get agent count per project
+  // Get agent count per project (excludes meta agent)
   getAgentCounts(): Map<string | null, number> {
     const rows = db.query(`
       SELECT project_id, COUNT(*) as count
       FROM agents
+      WHERE id != 'apteva-assistant'
       GROUP BY project_id
     `).all() as { project_id: string | null; count: number }[];
 
@@ -817,6 +972,14 @@ function rowToAgent(row: AgentRow): Agent {
       // Use empty array if parsing fails
     }
   }
+  let skills: string[] = [];
+  if (row.skills) {
+    try {
+      skills = JSON.parse(row.skills);
+    } catch {
+      // Use empty array if parsing fails
+    }
+  }
   return {
     id: row.id,
     name: row.name,
@@ -827,6 +990,7 @@ function rowToAgent(row: AgentRow): Agent {
     port: row.port,
     features,
     mcp_servers,
+    skills,
     project_id: row.project_id,
     api_key_encrypted: row.api_key_encrypted,
     created_at: row.created_at,
@@ -923,12 +1087,12 @@ export const McpServerDB = {
     const envEncrypted = encryptObject(server.env || {});
     const headersEncrypted = encryptObject(server.headers || {});
     const stmt = db.prepare(`
-      INSERT INTO mcp_servers (id, name, type, package, command, args, env, url, headers, source, status, port, created_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'stopped', NULL, ?)
+      INSERT INTO mcp_servers (id, name, type, package, pip_module, command, args, env, url, headers, source, project_id, status, port, created_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'stopped', NULL, ?)
     `);
     stmt.run(
-      server.id, server.name, server.type, server.package, server.command, server.args,
-      envEncrypted, server.url || null, headersEncrypted, server.source || null, now
+      server.id, server.name, server.type, server.package, server.pip_module || null, server.command, server.args,
+      envEncrypted, server.url || null, headersEncrypted, server.source || null, server.project_id || null, now
     );
     return this.findById(server.id)!;
   },
@@ -967,6 +1131,10 @@ export const McpServerDB = {
       fields.push("package = ?");
       values.push(updates.package);
     }
+    if (updates.pip_module !== undefined) {
+      fields.push("pip_module = ?");
+      values.push(updates.pip_module);
+    }
     if (updates.command !== undefined) {
       fields.push("command = ?");
       values.push(updates.command);
@@ -993,6 +1161,10 @@ export const McpServerDB = {
       fields.push("source = ?");
       values.push(updates.source);
     }
+    if (updates.project_id !== undefined) {
+      fields.push("project_id = ?");
+      values.push(updates.project_id);
+    }
     if (updates.port !== undefined) {
       fields.push("port = ?");
       values.push(updates.port);
@@ -1027,6 +1199,34 @@ export const McpServerDB = {
     const row = db.query("SELECT COUNT(*) as count FROM mcp_servers").get() as { count: number };
     return row.count;
   },
+
+  // Find servers by project (null = global only)
+  findByProject(projectId: string | null): McpServer[] {
+    if (projectId === null) {
+      const rows = db.query("SELECT * FROM mcp_servers WHERE project_id IS NULL ORDER BY created_at DESC").all() as McpServerRow[];
+      return rows.map(rowToMcpServer);
+    }
+    const rows = db.query("SELECT * FROM mcp_servers WHERE project_id = ? ORDER BY created_at DESC").all(projectId) as McpServerRow[];
+    return rows.map(rowToMcpServer);
+  },
+
+  // Find servers available for an agent (global + agent's project)
+  findForAgent(agentProjectId: string | null): McpServer[] {
+    if (agentProjectId === null) {
+      // Agent has no project, only show global servers
+      const rows = db.query("SELECT * FROM mcp_servers WHERE project_id IS NULL ORDER BY created_at DESC").all() as McpServerRow[];
+      return rows.map(rowToMcpServer);
+    }
+    // Agent has a project, show global + project servers
+    const rows = db.query("SELECT * FROM mcp_servers WHERE project_id IS NULL OR project_id = ? ORDER BY created_at DESC").all(agentProjectId) as McpServerRow[];
+    return rows.map(rowToMcpServer);
+  },
+
+  // Find global servers only
+  findGlobal(): McpServer[] {
+    const rows = db.query("SELECT * FROM mcp_servers WHERE project_id IS NULL ORDER BY created_at DESC").all() as McpServerRow[];
+    return rows.map(rowToMcpServer);
+  },
 };
 
 // Helper to convert DB row to McpServer type
@@ -1039,6 +1239,7 @@ function rowToMcpServer(row: McpServerRow): McpServer {
     name: row.name,
     type: row.type as McpServer["type"],
     package: row.package,
+    pip_module: row.pip_module,
     command: row.command,
     args: row.args,
     env,
@@ -1047,6 +1248,7 @@ function rowToMcpServer(row: McpServerRow): McpServer {
     port: row.port,
     status: row.status as "stopped" | "running",
     source: row.source,
+    project_id: row.project_id,
     created_at: row.created_at,
   };
 }
@@ -1621,6 +1823,227 @@ function rowToSession(row: SessionRow): Session {
   };
 }
 
+// Skill operations
+export const SkillDB = {
+  // Create a new skill
+  create(skill: Omit<Skill, "id" | "created_at" | "updated_at">): Skill {
+    const id = generateId();
+    const now = new Date().toISOString();
+    const metadataJson = JSON.stringify(skill.metadata || {});
+    const allowedToolsJson = JSON.stringify(skill.allowed_tools || []);
+
+    db.run(
+      `INSERT INTO skills (id, name, description, content, version, license, compatibility, metadata, allowed_tools, source, source_url, enabled, project_id, created_at, updated_at)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [
+        id,
+        skill.name,
+        skill.description,
+        skill.content,
+        skill.version || "1.0.0",
+        skill.license || null,
+        skill.compatibility || null,
+        metadataJson,
+        allowedToolsJson,
+        skill.source,
+        skill.source_url || null,
+        skill.enabled ? 1 : 0,
+        skill.project_id || null,
+        now,
+        now,
+      ]
+    );
+
+    return this.findById(id)!;
+  },
+
+  // Find skill by ID
+  findById(id: string): Skill | null {
+    const row = db.query("SELECT * FROM skills WHERE id = ?").get(id) as SkillRow | null;
+    return row ? rowToSkill(row) : null;
+  },
+
+  // Find skill by name
+  findByName(name: string): Skill | null {
+    const row = db.query("SELECT * FROM skills WHERE name = ?").get(name) as SkillRow | null;
+    return row ? rowToSkill(row) : null;
+  },
+
+  // Get all skills
+  findAll(): Skill[] {
+    const rows = db.query("SELECT * FROM skills ORDER BY name ASC").all() as SkillRow[];
+    return rows.map(rowToSkill);
+  },
+
+  // Get enabled skills
+  findEnabled(): Skill[] {
+    const rows = db.query("SELECT * FROM skills WHERE enabled = 1 ORDER BY name ASC").all() as SkillRow[];
+    return rows.map(rowToSkill);
+  },
+
+  // Update skill
+  update(id: string, updates: Partial<Omit<Skill, "id" | "created_at">>): Skill | null {
+    const skill = this.findById(id);
+    if (!skill) return null;
+
+    const fields: string[] = [];
+    const values: unknown[] = [];
+
+    if (updates.name !== undefined) {
+      fields.push("name = ?");
+      values.push(updates.name);
+    }
+    if (updates.description !== undefined) {
+      fields.push("description = ?");
+      values.push(updates.description);
+    }
+    if (updates.content !== undefined) {
+      fields.push("content = ?");
+      values.push(updates.content);
+    }
+    if (updates.version !== undefined) {
+      fields.push("version = ?");
+      values.push(updates.version);
+    }
+    if (updates.license !== undefined) {
+      fields.push("license = ?");
+      values.push(updates.license);
+    }
+    if (updates.compatibility !== undefined) {
+      fields.push("compatibility = ?");
+      values.push(updates.compatibility);
+    }
+    if (updates.metadata !== undefined) {
+      fields.push("metadata = ?");
+      values.push(JSON.stringify(updates.metadata));
+    }
+    if (updates.allowed_tools !== undefined) {
+      fields.push("allowed_tools = ?");
+      values.push(JSON.stringify(updates.allowed_tools));
+    }
+    if (updates.source !== undefined) {
+      fields.push("source = ?");
+      values.push(updates.source);
+    }
+    if (updates.source_url !== undefined) {
+      fields.push("source_url = ?");
+      values.push(updates.source_url);
+    }
+    if (updates.enabled !== undefined) {
+      fields.push("enabled = ?");
+      values.push(updates.enabled ? 1 : 0);
+    }
+    if (updates.project_id !== undefined) {
+      fields.push("project_id = ?");
+      values.push(updates.project_id);
+    }
+
+    if (fields.length > 0) {
+      fields.push("updated_at = ?");
+      values.push(new Date().toISOString());
+      values.push(id);
+
+      db.run(`UPDATE skills SET ${fields.join(", ")} WHERE id = ?`, values);
+    }
+
+    return this.findById(id);
+  },
+
+  // Toggle skill enabled/disabled
+  setEnabled(id: string, enabled: boolean): Skill | null {
+    return this.update(id, { enabled });
+  },
+
+  // Delete skill
+  delete(id: string): boolean {
+    const result = db.run("DELETE FROM skills WHERE id = ?", [id]);
+    return result.changes > 0;
+  },
+
+  // Count skills
+  count(): number {
+    const row = db.query("SELECT COUNT(*) as count FROM skills").get() as { count: number };
+    return row.count;
+  },
+
+  // Count enabled skills
+  countEnabled(): number {
+    const row = db.query("SELECT COUNT(*) as count FROM skills WHERE enabled = 1").get() as { count: number };
+    return row.count;
+  },
+
+  // Check if skill with name exists
+  exists(name: string): boolean {
+    const row = db.query("SELECT COUNT(*) as count FROM skills WHERE name = ?").get(name) as { count: number };
+    return row.count > 0;
+  },
+
+  // Find skills by project (null = global only)
+  findByProject(projectId: string | null): Skill[] {
+    if (projectId === null) {
+      const rows = db.query("SELECT * FROM skills WHERE project_id IS NULL ORDER BY name ASC").all() as SkillRow[];
+      return rows.map(rowToSkill);
+    }
+    const rows = db.query("SELECT * FROM skills WHERE project_id = ? ORDER BY name ASC").all(projectId) as SkillRow[];
+    return rows.map(rowToSkill);
+  },
+
+  // Find skills available for an agent (global + agent's project)
+  findForAgent(agentProjectId: string | null): Skill[] {
+    if (agentProjectId === null) {
+      // Agent has no project, only show global skills
+      const rows = db.query("SELECT * FROM skills WHERE project_id IS NULL ORDER BY name ASC").all() as SkillRow[];
+      return rows.map(rowToSkill);
+    }
+    // Agent has a project, show global + project skills
+    const rows = db.query("SELECT * FROM skills WHERE project_id IS NULL OR project_id = ? ORDER BY name ASC").all(agentProjectId) as SkillRow[];
+    return rows.map(rowToSkill);
+  },
+
+  // Find global skills only
+  findGlobal(): Skill[] {
+    const rows = db.query("SELECT * FROM skills WHERE project_id IS NULL ORDER BY name ASC").all() as SkillRow[];
+    return rows.map(rowToSkill);
+  },
+};
+
+// Helper to convert DB row to Skill type
+function rowToSkill(row: SkillRow): Skill {
+  let metadata: Record<string, string> = {};
+  if (row.metadata) {
+    try {
+      metadata = JSON.parse(row.metadata);
+    } catch {
+      // Use empty object if parsing fails
+    }
+  }
+  let allowed_tools: string[] = [];
+  if (row.allowed_tools) {
+    try {
+      allowed_tools = JSON.parse(row.allowed_tools);
+    } catch {
+      // Use empty array if parsing fails
+    }
+  }
+  return {
+    id: row.id,
+    name: row.name,
+    description: row.description,
+    content: row.content,
+    version: row.version || "1.0.0",
+    license: row.license,
+    compatibility: row.compatibility,
+    metadata,
+    allowed_tools,
+    source: row.source as Skill["source"],
+    source_url: row.source_url,
+    enabled: row.enabled === 1,
+    project_id: row.project_id,
+    created_at: row.created_at,
+    updated_at: row.updated_at,
+  };
+}
+
 // Generate unique ID
 export function generateId(): string {
   return Math.random().toString(36).substring(2, 15);