daemora 1.0.5 → 1.0.6

package/SOUL.md

@@ -6,9 +6,11 @@ You are **Daemora** — the user's personal AI that lives on their machine. You'
 
 **You are an agent, not a chatbot.** When told to do something, do it. Don't describe what you would do. Don't ask if you should. Don't propose a plan and wait. Just do the work and come back with results.
 
-**You own it end-to-end.** Write the code, run the build, test it, fix what breaks. Don't hand work back incomplete. The task is done when it actually works — not when you've made an attempt.
+**You are fully autonomous.** Execute the entire task start to finish without stopping to ask the user. Use your tools, skills, commands, browser, MCP servers — whatever it takes. Only stop and ask when you hit a genuine blocker that requires a human decision (e.g. "which of these two designs do you prefer?" or "this requires a paid API key I don't have"). Everything else — figure it out yourself and keep going.
 
-**You figure things out.** Read the file. Check the context. Run the command. Search for it. Only ask when you genuinely need a decision from the user — never ask about things you can discover yourself.
+**You own it end-to-end.** Write the code, run the build, test it, fix what breaks. Send the email, fetch the data, create the document, deploy the change. Don't hand work back incomplete. The task is done when it actually works — not when you've made an attempt.
+
+**You figure things out.** Read the file. Check the context. Run the command. Search for it. Load a skill. Check memory. Only ask when you genuinely need a decision from the user — never ask about things you can discover yourself.
 
 **You talk like a person.** You're not a customer support bot. No "I'd be happy to help!" No "What can I help you with today?" No "I have successfully completed the task." Talk like a capable person who just did something — brief, natural, real. If someone says "hey", say "hey" back. If you sent an email, say what you told them, not the Message ID.
 
@@ -49,9 +51,9 @@ A task is complex if it involves:
 
 ---
 
-## Coding - Full Ownership
+## Building & Coding - Full Ownership
 
-When you build something:
+When you build or create something:
 1. **Plan first for complex tasks.** Use projectTracker to break complex work into steps before writing code.
 2. **Read before touching.** Never edit a file you haven't read in this session.
 3. **Build, don't describe.** Write the actual code with writeFile/editFile. Never describe what code would look like.

package/config/mcp.json

@@ -24,29 +24,19 @@
     "_comment_memory": "Persistent memory via knowledge graph (no API key needed)",
     "memory": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-memory"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-memory"],
       "enabled": false
     },
-    "_comment_filesystem": "Secure file access (CHANGE the path to your workspace!)",
+    "_comment_filesystem": "Secure file access (set allowed directory paths in args)",
     "filesystem": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-filesystem",
-        "/Users/you/Projects"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/Users/you/Projects"],
       "enabled": false
     },
     "_comment_github": "GitHub integration - repos, PRs, issues, commits",
     "github": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-github"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-github"],
       "env": {
         "GITHUB_PERSONAL_ACCESS_TOKEN": "YOUR_GITHUB_TOKEN"
       },
@@ -55,72 +45,38 @@
     "_comment_brave": "Brave Search - web, news, image search",
     "brave-search": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@anthropic-ai/brave-search-mcp-server"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-brave-search"],
       "env": {
         "BRAVE_API_KEY": "YOUR_BRAVE_API_KEY"
       },
       "enabled": false
     },
-    "_comment_git": "Git operations - read, search, manipulate repos",
-    "git": {
-      "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-git"
-      ],
-      "enabled": false
-    },
-    "_comment_fetch": "Web fetching - convert web pages to LLM-friendly text",
-    "fetch": {
-      "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-fetch"
-      ],
-      "enabled": false
-    },
     "_comment_slack": "Slack workspace integration",
     "slack": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-slack"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-slack"],
       "env": {
         "SLACK_BOT_TOKEN": "",
         "SLACK_TEAM_ID": ""
       },
       "enabled": false
     },
-    "_comment_postgres": "PostgreSQL database access",
+    "_comment_postgres": "PostgreSQL database access (read-only SQL)",
     "postgres": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-postgres",
-        "postgresql://user:pass@localhost:5432/mydb"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-postgres", "postgresql://user:pass@localhost:5432/mydb"],
       "enabled": false
     },
-    "_comment_puppeteer": "Browser automation via Puppeteer",
+    "_comment_puppeteer": "Browser automation, screenshots, web interaction",
     "puppeteer": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-puppeteer"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-puppeteer"],
       "enabled": false
     },
-    "_comment_sentry": "Sentry error tracking integration",
+    "_comment_sentry": "Sentry error tracking - query issues, generate patches",
     "sentry": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@sentry/mcp-server@latest"
-      ],
+      "args": ["-y", "@sentry/mcp-server@latest"],
       "env": {
         "SENTRY_AUTH_TOKEN": "YOUR_SENTRY_AUTH_TOKEN"
       },
@@ -129,17 +85,121 @@
     "_comment_sequential": "Sequential thinking - structured problem solving",
     "sequential-thinking": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-sequentialthinking"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-sequential-thinking"],
+      "enabled": false
+    },
+    "_comment_notion": "Notion - pages, databases, search, comments",
+    "notion": {
+      "command": "npx",
+      "args": ["-y", "@notionhq/notion-mcp-server"],
+      "env": {
+        "NOTION_TOKEN": ""
+      },
+      "enabled": false
+    },
+    "_comment_linear": "Linear - issues, projects, teams, sprints",
+    "linear": {
+      "command": "npx",
+      "args": ["-y", "mcp-remote", "https://mcp.linear.app/mcp"],
+      "enabled": false
+    },
+    "_comment_hubspot": "HubSpot CRM - contacts, deals, companies, tickets",
+    "hubspot": {
+      "command": "npx",
+      "args": ["-y", "@hubspot/mcp-server"],
+      "env": {
+        "PRIVATE_APP_ACCESS_TOKEN": ""
+      },
+      "enabled": false
+    },
+    "_comment_stripe": "Stripe - payments, invoices, subscriptions, customers",
+    "stripe": {
+      "command": "npx",
+      "args": ["-y", "@stripe/mcp", "--tools=all"],
+      "env": {
+        "STRIPE_SECRET_KEY": ""
+      },
+      "enabled": false
+    },
+    "_comment_jira": "Jira - issues, projects, sprints, JQL search",
+    "jira": {
+      "command": "npx",
+      "args": ["-y", "@aashari/mcp-server-atlassian-jira"],
+      "env": {
+        "ATLASSIAN_SITE_NAME": "",
+        "ATLASSIAN_USER_EMAIL": "",
+        "ATLASSIAN_API_TOKEN": ""
+      },
+      "enabled": false
+    },
+    "_comment_confluence": "Confluence - spaces, pages, search, content",
+    "confluence": {
+      "command": "npx",
+      "args": ["-y", "@aashari/mcp-server-atlassian-confluence"],
+      "env": {
+        "ATLASSIAN_SITE_NAME": "",
+        "ATLASSIAN_USER_EMAIL": "",
+        "ATLASSIAN_API_TOKEN": ""
+      },
+      "enabled": false
+    },
+    "_comment_figma": "Figma - design data, layouts, styles, components",
+    "figma": {
+      "command": "npx",
+      "args": ["-y", "figma-developer-mcp", "--figma-api-key=YOUR_FIGMA_TOKEN", "--stdio"],
+      "enabled": false
+    },
+    "_comment_gdrive": "Google Drive - files, folders, search",
+    "gdrive": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-gdrive"],
+      "env": {
+        "GDRIVE_CREDENTIALS_PATH": ""
+      },
+      "enabled": false
+    },
+    "_comment_google_maps": "Google Maps - geocoding, directions, places, elevation",
+    "google-maps": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-google-maps"],
+      "env": {
+        "GOOGLE_MAPS_API_KEY": ""
+      },
+      "enabled": false
+    },
+    "_comment_firecrawl": "Firecrawl - web scraping, crawling, content extraction",
+    "firecrawl": {
+      "command": "npx",
+      "args": ["-y", "firecrawl-mcp"],
+      "env": {
+        "FIRECRAWL_API_KEY": ""
+      },
+      "enabled": false
+    },
+    "_comment_tavily": "Tavily - real-time web search, data extraction",
+    "tavily": {
+      "command": "npx",
+      "args": ["-y", "tavily-mcp@latest"],
+      "env": {
+        "TAVILY_API_KEY": ""
+      },
+      "enabled": false
+    },
+    "_comment_cloudflare": "Cloudflare - Workers, KV, R2, D1 management",
+    "cloudflare": {
+      "command": "npx",
+      "args": ["-y", "@cloudflare/mcp-server-cloudflare"],
       "enabled": false
     },
-    "Umar": {
-      "enabled": false,
-      "url": "https://api.example.com/sse",
-      "transport": "sse",
-      "description": "kajshdkjahskdhaskdh"
+    "_comment_upstash": "Upstash - serverless Redis and message queues",
+    "upstash": {
+      "command": "npx",
+      "args": ["-y", "@upstash/mcp-server"],
+      "env": {
+        "UPSTASH_REDIS_REST_URL": "",
+        "UPSTASH_REDIS_REST_TOKEN": ""
+      },
+      "enabled": false
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daemora",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A powerful open-source AI agent that runs on your machine. Connects to any AI model, any MCP server, any channel. Fully autonomous - plans, codes, tests, browses, emails, and manages your tools without asking permission.",
   "main": "src/index.js",
   "bin": {

package/src/agents/SubAgentManager.js

@@ -1,5 +1,5 @@
 import { runAgentLoop } from "../core/AgentLoop.js";
-import { buildSystemPrompt } from "../systemPrompt.js";
+import { buildSystemPrompt } from "./systemPrompt.js";
 import { toolFunctions } from "../tools/index.js";
 import { agentProfiles, defaultSubAgentTools } from "../config/agentProfiles.js";
 import { config } from "../config/default.js";
@@ -8,6 +8,7 @@ import { v4 as uuidv4 } from "uuid";
 import tenantContext from "../tenants/TenantContext.js";
 import { resolveModelForProfile } from "../models/ModelRouter.js";
 import { createSession, getSession, setMessages } from "../services/sessions.js";
+import skillLoader from "../skills/SkillLoader.js";
 
 /**
  * Sub-Agent Manager - spawns, tracks, kills, and steers sub-agents.
@@ -29,6 +30,27 @@ import { createSession, getSession, setMessages } from "../services/sessions.js"
 
 const MAX_CONCURRENT_SUB_AGENTS = 7;
 
+/**
+ * Resolve sub-agent model. Priority:
+ *   1. Profile-specific route (tenant modelRoutes[profile] or CODE_MODEL/etc env)
+ *   2. SUB_AGENT_MODEL (tenant-level or env-level)
+ *   3. Parent agent's model (inherit from main agent)
+ *   4. DEFAULT_MODEL
+ */
+function _resolveSubAgentModel(profile, tenantConfig, parentModel) {
+  const _profileEnvMap = { coder: "CODE_MODEL", researcher: "RESEARCH_MODEL", writer: "WRITER_MODEL", analyst: "ANALYST_MODEL" };
+  // 1. Profile-specific
+  if (profile && tenantConfig.modelRoutes?.[profile]) return tenantConfig.modelRoutes[profile];
+  if (profile && process.env[_profileEnvMap[profile]]) return process.env[_profileEnvMap[profile]];
+  // 2. Sub-agent model (tenant > env)
+  if (tenantConfig.subAgentModel) return tenantConfig.subAgentModel;
+  if (process.env.SUB_AGENT_MODEL) return process.env.SUB_AGENT_MODEL;
+  // 3. Parent's model — sub-agents default to the same model as the main agent
+  if (parentModel) return parentModel;
+  // 4. Global default
+  return config.defaultModel;
+}
+
 /** Map<agentId, { taskDescription, startedAt, parentTaskId, abortController, steerQueue }> */
 const activeSubAgents = new Map();
 
@@ -83,6 +105,7 @@ eventBus.on("supervisor:kill", ({ taskId }) => {
  * @param {number}   [options.depth]               Recursion depth (managed internally)
  * @param {string}   [options.parentTaskId]        Parent task ID for kill propagation
  * @param {string}   [options.parentContext]       Summary/context from parent agent
+ * @param {string[]} [options.skills]              Skill paths to inject (e.g. ["skills/coding.md", "skills/brand-guidelines.md"])
  * @param {string}   [options.approvalMode]        Inherited approval mode
  * @param {object}   [options.channelMeta]         Inherited channel meta for approvals
  * @returns {Promise<string>} Sub-agent's final response
@@ -100,6 +123,7 @@ export async function spawnSubAgent(taskDescription, options = {}) {
     depth                = 0,
     parentTaskId         = null,
     parentContext        = null,
+    skills               = null,        // explicit skill paths to inject (e.g. ["skills/coding.md"])
     approvalMode         = "auto",
     channelMeta          = null,
     historyMessages      = [],     // previous session messages to prepend (persistent sub-agent sessions)
@@ -118,12 +142,12 @@ export async function spawnSubAgent(taskDescription, options = {}) {
   const agentId = uuidv4().slice(0, 8);
   const taskId  = `subagent-${agentId}`;
 
-  // ── Model resolution - priority: explicit > profile routing > parent > global default ───────
+  // ── Model resolution ────────────────────────────────────────────────────
+  // Priority: explicit > profile route > SUB_AGENT_MODEL > parent's model > DEFAULT_MODEL
   const store = tenantContext.getStore();
+  const parentModel = store?.resolvedModel || null;
   const resolvedModel = model
-    || resolveModelForProfile(profile, store?.resolvedConfig || {}, null)
-    || store?.resolvedModel
-    || config.defaultModel;
+    || _resolveSubAgentModel(profile, store?.resolvedConfig || {}, parentModel);
 
   const profileLabel = profile ? ` [${profile}]` : "";
   const modelLabel   = resolvedModel ? ` ${C.dim}(${resolvedModel})${C.reset}` : "";
@@ -249,13 +273,62 @@ export async function spawnSubAgent(taskDescription, options = {}) {
     }
   }
 
-  // ── Build initial messages (include history + optionally parent context) ──
+  // ── Skill injection ─────────────────────────────────────────────────────
+  // Priority: 1) Explicit skills passed by parent  2) Semantic embedding search
+  // Both produce full skill content so the sub-agent doesn't waste a readFile turn.
+  let skillContext = "";
+  try {
+    const injectedSkills = [];
+
+    // 1. Explicit skills — parent agent passed skill paths/names directly
+    if (skills && skills.length > 0) {
+      for (const ref of skills) {
+        const skill = skillLoader.getSkill(ref);
+        if (skill) {
+          injectedSkills.push(skill);
+        } else {
+          console.log(`[SubAgent:${agentId}] Skill not found: "${ref}"`);
+        }
+      }
+    }
+
+    // 2. Semantic embedding search — find relevant skills the parent didn't explicitly pass
+    if (injectedSkills.length === 0 && taskDescription) {
+      const semanticResult = await skillLoader.getSkillPromptsAsync(taskDescription);
+      if (semanticResult) {
+        // getSkillPromptsAsync returns formatted string with --- Skill: name --- blocks
+        skillContext = semanticResult;
+      }
+    }
+
+    // Format explicitly-passed skills
+    if (injectedSkills.length > 0) {
+      skillContext = injectedSkills.map(s =>
+        `\n--- Skill: ${s.name} ---\n${s.content}\n--- End Skill ---`
+      ).join("\n");
+    }
+
+    if (injectedSkills.length > 0) {
+      console.log(`[SubAgent:${agentId}] Injected ${injectedSkills.length} skill(s) (explicit): ${injectedSkills.map(s => s.name).join(", ")}`);
+    } else if (skillContext) {
+      console.log(`[SubAgent:${agentId}] Injected skills (semantic embedding match)`);
+    }
+  } catch (e) {
+    // Non-blocking — skills are optional
+    console.log(`[SubAgent:${agentId}] Skill injection failed (non-blocking): ${e.message}`);
+  }
+
+  // ── Build initial messages (include history + parent context + skills) ──
   const initialMessages = [...historyMessages];
 
-  if (parentContext) {
+  const contextParts = [];
+  if (parentContext) contextParts.push(`[Context from parent agent]:\n${parentContext}`);
+  if (skillContext) contextParts.push(`[Matched Skills — follow these instructions precisely]:\n${skillContext}`);
+
+  if (contextParts.length > 0) {
     initialMessages.push({
       role: "user",
-      content: `[Context from parent agent]:\n${parentContext}\n\n[Your task]:\n${taskDescription}`,
+      content: `${contextParts.join("\n\n")}\n\n[Your task]:\n${taskDescription}`,
     });
   } else {
     initialMessages.push({ role: "user", content: taskDescription });