@within-7/minto 0.3.6 → 0.3.10

package/dist/utils/agentHookExecutor.js

@@ -0,0 +1,103 @@
+import { exec } from "child_process";
+import { promisify } from "util";
+import { getCwd } from "./state.js";
+const execAsync = promisify(exec);
+const DEFAULT_HOOK_TIMEOUT = 6e4;
+async function executeHook(hook, context) {
+  const startTime = Date.now();
+  const timeout = (hook.timeout ?? 60) * 1e3;
+  try {
+    if (hook.type === "command" && hook.command) {
+      const { stdout, stderr } = await execAsync(hook.command, {
+        timeout: Math.min(timeout, DEFAULT_HOOK_TIMEOUT),
+        cwd: context.cwd,
+        env: {
+          ...process.env,
+          ...context.env,
+          AGENT_ID: context.agentId,
+          AGENT_TYPE: context.agentType,
+          SESSION_ID: context.sessionId,
+          HOOK_CWD: context.cwd
+        }
+      });
+      let parsedOutput = null;
+      try {
+        if (stdout.trim().startsWith("{")) {
+          parsedOutput = JSON.parse(stdout.trim());
+        }
+      } catch {
+      }
+      return {
+        success: true,
+        continue: parsedOutput?.continue !== false,
+        reason: parsedOutput?.stopReason,
+        output: stdout,
+        executionTime: Date.now() - startTime
+      };
+    } else if (hook.type === "prompt" && hook.prompt) {
+      return {
+        success: true,
+        continue: true,
+        output: hook.prompt,
+        executionTime: Date.now() - startTime
+      };
+    }
+    return {
+      success: false,
+      continue: true,
+      reason: "Invalid hook configuration: missing command or prompt",
+      executionTime: Date.now() - startTime
+    };
+  } catch (error) {
+    return {
+      success: false,
+      continue: true,
+      // Default to continue on error
+      error: error instanceof Error ? error : new Error(String(error)),
+      executionTime: Date.now() - startTime
+    };
+  }
+}
+async function executeAgentHooks(event, agentConfig, context) {
+  const hooks = agentConfig.hooks?.[event];
+  if (!hooks || hooks.length === 0) {
+    return { continue: true, outputs: [] };
+  }
+  const outputs = [];
+  let shouldContinue = true;
+  let stopReason;
+  for (const hook of hooks) {
+    const result = await executeHook(hook, context);
+    if (result.output) {
+      outputs.push(result.output);
+    }
+    if (!result.continue) {
+      shouldContinue = false;
+      stopReason = result.reason || "Hook requested stop";
+      break;
+    }
+    if (!result.success && result.error) {
+      console.warn(`Hook ${event} execution failed:`, result.error.message);
+    }
+  }
+  return {
+    continue: shouldContinue,
+    reason: stopReason,
+    outputs
+  };
+}
+function createHookContext(params) {
+  return {
+    sessionId: params.sessionId,
+    agentId: params.agentId,
+    agentType: params.agentType,
+    cwd: getCwd(),
+    error: params.error,
+    result: params.result
+  };
+}
+export {
+  createHookContext,
+  executeAgentHooks
+};
+//# sourceMappingURL=agentHookExecutor.js.map

package/dist/utils/agentHookExecutor.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/utils/agentHookExecutor.ts"],
+  "sourcesContent": ["/**\n * Agent Hook Executor\n *\n * Executes lifecycle hooks for agents as defined in Claude Code specification.\n * Supports onStart, onComplete, and onError hooks with security controls.\n */\n\nimport { exec } from 'child_process'\nimport { promisify } from 'util'\nimport type { HookDefinition } from '@minto-types/hooks'\nimport type { AgentConfig, AgentHooks } from './agentLoader'\nimport { getCwd } from './state'\n\nconst execAsync = promisify(exec)\n\n/**\n * Hook execution context\n */\nexport interface HookExecutionContext {\n  sessionId: string\n  agentId: string\n  agentType: string\n  cwd: string\n  env?: Record<string, string>\n  error?: Error // For onError hooks\n  result?: string // For onComplete hooks\n}\n\n/**\n * Hook execution result\n */\nexport interface HookExecutionResult {\n  success: boolean\n  continue: boolean\n  reason?: string\n  output?: string\n  error?: Error\n  executionTime: number\n}\n\n/**\n * Default hook timeout in milliseconds\n */\nconst DEFAULT_HOOK_TIMEOUT = 60000 // 60 seconds\n\n/**\n * Execute a single hook\n */\nasync function executeHook(\n  hook: HookDefinition,\n  context: HookExecutionContext,\n): Promise<HookExecutionResult> {\n  const startTime = Date.now()\n  const timeout = (hook.timeout ?? 60) * 1000 // Convert seconds to milliseconds\n\n  try {\n    if (hook.type === 'command' && hook.command) {\n      // Execute shell command\n      const { stdout, stderr } = await execAsync(hook.command, {\n        timeout: Math.min(timeout, DEFAULT_HOOK_TIMEOUT),\n        cwd: context.cwd,\n        env: {\n          ...process.env,\n          ...context.env,\n          AGENT_ID: context.agentId,\n          AGENT_TYPE: context.agentType,\n          SESSION_ID: context.sessionId,\n          HOOK_CWD: context.cwd,\n        },\n      })\n\n      // Try to parse JSON output for hook control\n      let parsedOutput: any = null\n      try {\n        if (stdout.trim().startsWith('{')) {\n          parsedOutput = JSON.parse(stdout.trim())\n        }\n      } catch {\n        // Not JSON, that's fine\n      }\n\n      return {\n        success: true,\n        continue: parsedOutput?.continue !== false,\n        reason: parsedOutput?.stopReason,\n        output: stdout,\n        executionTime: Date.now() - startTime,\n      }\n    } else if (hook.type === 'prompt' && hook.prompt) {\n      // Prompt hooks are handled by the agent system\n      // For now, we just return success and let the caller handle the prompt\n      return {\n        success: true,\n        continue: true,\n        output: hook.prompt,\n        executionTime: Date.now() - startTime,\n      }\n    }\n\n    // Invalid hook configuration\n    return {\n      success: false,\n      continue: true,\n      reason: 'Invalid hook configuration: missing command or prompt',\n      executionTime: Date.now() - startTime,\n    }\n  } catch (error) {\n    return {\n      success: false,\n      continue: true, // Default to continue on error\n      error: error instanceof Error ? error : new Error(String(error)),\n      executionTime: Date.now() - startTime,\n    }\n  }\n}\n\n/**\n * Execute agent lifecycle hooks\n *\n * @param event - The lifecycle event (onStart, onComplete, onError)\n * @param agentConfig - The agent configuration containing hooks\n * @param context - The execution context\n * @returns Combined result of all hook executions\n */\nexport async function executeAgentHooks(\n  event: keyof AgentHooks,\n  agentConfig: AgentConfig,\n  context: HookExecutionContext,\n): Promise<{ continue: boolean; reason?: string; outputs: string[] }> {\n  const hooks = agentConfig.hooks?.[event]\n\n  if (!hooks || hooks.length === 0) {\n    return { continue: true, outputs: [] }\n  }\n\n  const outputs: string[] = []\n  let shouldContinue = true\n  let stopReason: string | undefined\n\n  for (const hook of hooks) {\n    const result = await executeHook(hook, context)\n\n    if (result.output) {\n      outputs.push(result.output)\n    }\n\n    if (!result.continue) {\n      shouldContinue = false\n      stopReason = result.reason || 'Hook requested stop'\n      break // Stop executing further hooks\n    }\n\n    if (!result.success && result.error) {\n      console.warn(`Hook ${event} execution failed:`, result.error.message)\n      // Continue to next hook on error by default\n    }\n  }\n\n  return {\n    continue: shouldContinue,\n    reason: stopReason,\n    outputs,\n  }\n}\n\n/**\n * Create hook execution context from agent execution state\n */\nexport function createHookContext(params: {\n  sessionId: string\n  agentId: string\n  agentType: string\n  error?: Error\n  result?: string\n}): HookExecutionContext {\n  return {\n    sessionId: params.sessionId,\n    agentId: params.agentId,\n    agentType: params.agentType,\n    cwd: getCwd(),\n    error: params.error,\n    result: params.result,\n  }\n}\n"],
+  "mappings": "AAOA,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAG1B,SAAS,cAAc;AAEvB,MAAM,YAAY,UAAU,IAAI;AA8BhC,MAAM,uBAAuB;AAK7B,eAAe,YACb,MACA,SAC8B;AAC9B,QAAM,YAAY,KAAK,IAAI;AAC3B,QAAM,WAAW,KAAK,WAAW,MAAM;AAEvC,MAAI;AACF,QAAI,KAAK,SAAS,aAAa,KAAK,SAAS;AAE3C,YAAM,EAAE,QAAQ,OAAO,IAAI,MAAM,UAAU,KAAK,SAAS;AAAA,QACvD,SAAS,KAAK,IAAI,SAAS,oBAAoB;AAAA,QAC/C,KAAK,QAAQ;AAAA,QACb,KAAK;AAAA,UACH,GAAG,QAAQ;AAAA,UACX,GAAG,QAAQ;AAAA,UACX,UAAU,QAAQ;AAAA,UAClB,YAAY,QAAQ;AAAA,UACpB,YAAY,QAAQ;AAAA,UACpB,UAAU,QAAQ;AAAA,QACpB;AAAA,MACF,CAAC;AAGD,UAAI,eAAoB;AACxB,UAAI;AACF,YAAI,OAAO,KAAK,EAAE,WAAW,GAAG,GAAG;AACjC,yBAAe,KAAK,MAAM,OAAO,KAAK,CAAC;AAAA,QACzC;AAAA,MACF,QAAQ;AAAA,MAER;AAEA,aAAO;AAAA,QACL,SAAS;AAAA,QACT,UAAU,cAAc,aAAa;AAAA,QACrC,QAAQ,cAAc;AAAA,QACtB,QAAQ;AAAA,QACR,eAAe,KAAK,IAAI,IAAI;AAAA,MAC9B;AAAA,IACF,WAAW,KAAK,SAAS,YAAY,KAAK,QAAQ;AAGhD,aAAO;AAAA,QACL,SAAS;AAAA,QACT,UAAU;AAAA,QACV,QAAQ,KAAK;AAAA,QACb,eAAe,KAAK,IAAI,IAAI;AAAA,MAC9B;AAAA,IACF;AAGA,WAAO;AAAA,MACL,SAAS;AAAA,MACT,UAAU;AAAA,MACV,QAAQ;AAAA,MACR,eAAe,KAAK,IAAI,IAAI;AAAA,IAC9B;AAAA,EACF,SAAS,OAAO;AACd,WAAO;AAAA,MACL,SAAS;AAAA,MACT,UAAU;AAAA;AAAA,MACV,OAAO,iBAAiB,QAAQ,QAAQ,IAAI,MAAM,OAAO,KAAK,CAAC;AAAA,MAC/D,eAAe,KAAK,IAAI,IAAI;AAAA,IAC9B;AAAA,EACF;AACF;AAUA,eAAsB,kBACpB,OACA,aACA,SACoE;AACpE,QAAM,QAAQ,YAAY,QAAQ,KAAK;AAEvC,MAAI,CAAC,SAAS,MAAM,WAAW,GAAG;AAChC,WAAO,EAAE,UAAU,MAAM,SAAS,CAAC,EAAE;AAAA,EACvC;AAEA,QAAM,UAAoB,CAAC;AAC3B,MAAI,iBAAiB;AACrB,MAAI;AAEJ,aAAW,QAAQ,OAAO;AACxB,UAAM,SAAS,MAAM,YAAY,MAAM,OAAO;AAE9C,QAAI,OAAO,QAAQ;AACjB,cAAQ,KAAK,OAAO,MAAM;AAAA,IAC5B;AAEA,QAAI,CAAC,OAAO,UAAU;AACpB,uBAAiB;AACjB,mBAAa,OAAO,UAAU;AAC9B;AAAA,IACF;AAEA,QAAI,CAAC,OAAO,WAAW,OAAO,OAAO;AACnC,cAAQ,KAAK,QAAQ,KAAK,sBAAsB,OAAO,MAAM,OAAO;AAAA,IAEtE;AAAA,EACF;AAEA,SAAO;AAAA,IACL,UAAU;AAAA,IACV,QAAQ;AAAA,IACR;AAAA,EACF;AACF;AAKO,SAAS,kBAAkB,QAMT;AACvB,SAAO;AAAA,IACL,WAAW,OAAO;AAAA,IAClB,SAAS,OAAO;AAAA,IAChB,WAAW,OAAO;AAAA,IAClB,KAAK,OAAO;AAAA,IACZ,OAAO,OAAO;AAAA,IACd,QAAQ,OAAO;AAAA,EACjB;AACF;",
+  "names": []
+}

package/dist/utils/agentLoader.js

@@ -12,25 +12,117 @@ import { getCwd } from "./state.js";
 import { memoize } from "lodash-es";
 import { loadAllPlugins } from "./pluginLoader.js";
 const warnedAgents = /* @__PURE__ */ new Set();
-const BUILTIN_GENERAL_PURPOSE = {
-  agentType: "general-purpose",
-  whenToUse: "General-purpose agent for researching complex questions, searching for code, and executing multi-step tasks",
-  tools: "*",
-  systemPrompt: `You are a general-purpose agent. Given the user's task, use the tools available to complete it efficiently and thoroughly.
+const BUILTIN_AGENTS = [
+  // general-purpose: Default agent for multi-step tasks
+  {
+    agentType: "general-purpose",
+    whenToUse: "General-purpose agent for researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries use this agent.",
+    tools: "*",
+    systemPrompt: `You are a general-purpose agent. Given the user's task, use the tools available to complete it efficiently and thoroughly.
 
 When to use your capabilities:
 - Searching for code, configurations, and patterns across large codebases
-- Analyzing multiple files to understand system architecture  
+- Analyzing multiple files to understand system architecture
 - Investigating complex questions that require exploring many files
 - Performing multi-step research tasks
 
 Guidelines:
-- For file searches: Use Grep or Glob when you need to search broadly. Use FileRead when you know the specific file path.
+- For file searches: Use Grep or Glob when you need to search broadly. Use Read when you know the specific file path.
 - For analysis: Start broad and narrow down. Use multiple search strategies if the first doesn't yield results.
 - Be thorough: Check multiple locations, consider different naming conventions, look for related files.
 - Complete tasks directly using your capabilities.`,
-  location: "built-in"
-};
+    location: "built-in"
+  },
+  // Explore: Fast read-only codebase exploration (Claude Code spec)
+  {
+    agentType: "Explore",
+    whenToUse: 'Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns, search code for keywords, or answer questions about the codebase. Specify thoroughness: "quick" for basic searches, "medium" for moderate exploration, "very thorough" for comprehensive analysis.',
+    tools: ["Read", "Glob", "Grep", "LS", "WebSearch", "WebFetch"],
+    disallowedTools: ["Edit", "Write", "Bash", "NotebookEdit"],
+    model_name: "quick",
+    // Maps to haiku equivalent
+    permissionMode: "plan",
+    // Read-only mode
+    systemPrompt: `You are an exploration agent optimized for fast codebase searches and understanding.
+
+Your role:
+- Quickly find files, functions, classes, and patterns
+- Understand code structure and architecture
+- Answer questions about how code works
+- Identify relevant files for a given task
+
+Guidelines:
+- Use Glob for finding files by pattern (e.g., "**/*.tsx", "src/**/*.ts")
+- Use Grep for searching code content (e.g., function names, imports, patterns)
+- Use Read to examine specific files you've identified
+- Start broad, then narrow down based on results
+- Report findings with specific file paths and line numbers
+- Be thorough but efficient - check multiple locations and naming conventions
+
+You are READ-ONLY. You cannot modify any files.`,
+    location: "built-in"
+  },
+  // Plan: Research and planning agent (Claude Code spec)
+  {
+    agentType: "Plan",
+    whenToUse: "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a task. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs.",
+    tools: ["Read", "Glob", "Grep", "LS", "WebSearch", "WebFetch", "Think"],
+    disallowedTools: ["Edit", "Write", "Bash", "NotebookEdit"],
+    model_name: "inherit",
+    // Inherit caller's model
+    permissionMode: "plan",
+    // Read-only mode
+    systemPrompt: `You are a planning agent specialized in analyzing codebases and creating implementation plans.
+
+Your role:
+- Understand requirements and constraints
+- Analyze existing code patterns and architecture
+- Create detailed, step-by-step implementation plans
+- Identify potential issues and trade-offs
+- Recommend best approaches based on codebase conventions
+
+Guidelines:
+- Read relevant files to understand current patterns
+- Identify all files that will need modification
+- Consider edge cases and error handling
+- Note any dependencies or prerequisites
+- Provide specific, actionable steps
+
+Output format:
+1. Summary of the task
+2. Files to modify/create (with paths)
+3. Step-by-step implementation plan
+4. Potential challenges or considerations
+5. Testing approach
+
+You are READ-ONLY. You cannot modify any files. Focus on planning, not execution.`,
+    location: "built-in"
+  },
+  // Bash: Shell command execution agent (Claude Code spec)
+  {
+    agentType: "Bash",
+    whenToUse: "Command execution specialist for running bash commands. Use this for git operations, command execution, and other terminal tasks.",
+    tools: ["Bash", "Read", "LS"],
+    systemPrompt: `You are a bash execution agent specialized in running shell commands.
+
+Your role:
+- Execute shell commands safely and effectively
+- Handle build, test, and deployment tasks
+- Manage git operations
+- Run scripts and automation
+
+Guidelines:
+- Check command syntax before execution
+- Handle errors gracefully with clear messages
+- Report command output and exit codes
+- Be cautious with destructive commands (rm, git reset, etc.)
+- Use appropriate flags for verbose output when debugging
+- Chain commands with && for dependent operations
+
+Always explain what a command will do before running it if it modifies the system.`,
+    location: "built-in"
+  }
+];
 function parseTools(tools) {
   if (!tools) return "*";
   if (tools === "*") return "*";
@@ -41,10 +133,76 @@ function parseTools(tools) {
     return filteredTools.length > 0 ? filteredTools : "*";
   }
   if (typeof tools === "string") {
+    if (tools.includes(",")) {
+      return tools.split(",").map((t) => t.trim()).filter(Boolean);
+    }
     return [tools];
   }
   return "*";
 }
+function parseDisallowedTools(disallowedTools) {
+  if (!disallowedTools) return void 0;
+  if (Array.isArray(disallowedTools)) {
+    const filtered = disallowedTools.filter(
+      (t) => typeof t === "string"
+    );
+    return filtered.length > 0 ? filtered : void 0;
+  }
+  if (typeof disallowedTools === "string") {
+    if (disallowedTools.includes(",")) {
+      return disallowedTools.split(",").map((t) => t.trim()).filter(Boolean);
+    }
+    return [disallowedTools];
+  }
+  return void 0;
+}
+function parseSkills(skills) {
+  if (!skills) return void 0;
+  if (Array.isArray(skills)) {
+    const filtered = skills.filter((s) => typeof s === "string");
+    return filtered.length > 0 ? filtered : void 0;
+  }
+  if (typeof skills === "string") {
+    if (skills.includes(",")) {
+      return skills.split(",").map((s) => s.trim()).filter(Boolean);
+    }
+    return [skills];
+  }
+  return void 0;
+}
+function parseMemory(memory) {
+  if (!memory) return void 0;
+  if (typeof memory === "string") {
+    if (["user", "project", "local"].includes(memory)) {
+      return { scope: memory };
+    }
+    return void 0;
+  }
+  if (typeof memory === "object") {
+    const scope = memory.scope;
+    if (["user", "project", "local"].includes(scope)) {
+      return {
+        scope,
+        ...memory.key && { key: String(memory.key) }
+      };
+    }
+  }
+  return void 0;
+}
+function parsePermissionMode(mode) {
+  if (!mode) return void 0;
+  const validModes = [
+    "default",
+    "acceptEdits",
+    "dontAsk",
+    "plan",
+    "bypassPermissions"
+  ];
+  if (typeof mode === "string" && validModes.includes(mode)) {
+    return mode;
+  }
+  return void 0;
+}
 async function scanAgentDirectory(dirPath, location) {
   if (!existsSync(dirPath)) {
     return [];
@@ -59,12 +217,24 @@ async function scanAgentDirectory(dirPath, location) {
       if (!stat.isFile()) continue;
       try {
         const content = readFileSync(filePath, "utf-8");
+        if (!content.trim()) continue;
         const { data: frontmatter, content: body } = matter(content);
         if (!frontmatter.name || !frontmatter.description) {
-          console.warn(
-            `Skipping ${filePath}: missing required fields (name, description)`
-          );
-          continue;
+          const headingMatch = body.match(/^#\s+(.+)/m);
+          const firstParagraph = body.split(/\n\n/).find((p) => p.trim() && !p.trim().startsWith("#"));
+          if (headingMatch) {
+            if (!frontmatter.name) {
+              frontmatter.name = headingMatch[1].trim();
+            }
+            if (!frontmatter.description) {
+              frontmatter.description = firstParagraph?.trim() || frontmatter.name;
+            }
+          } else {
+            console.warn(
+              `Skipping ${filePath}: missing required fields (name, description)`
+            );
+            continue;
+          }
         }
         if (frontmatter.model && !frontmatter.model_name && !warnedAgents.has(frontmatter.name) && process.env.MINTO_DEBUG_AGENTS) {
           console.warn(
@@ -72,15 +242,30 @@ async function scanAgentDirectory(dirPath, location) {
           );
           warnedAgents.add(frontmatter.name);
         }
+        const disallowedTools = parseDisallowedTools(
+          frontmatter.disallowedTools
+        );
+        const skills = parseSkills(frontmatter.skills);
+        const memory = parseMemory(frontmatter.memory);
+        const permissionMode = parsePermissionMode(frontmatter.permissionMode);
         const agent = {
           agentType: frontmatter.name,
           whenToUse: frontmatter.description.replace(/\\n/g, "\n"),
           tools: parseTools(frontmatter.tools),
           systemPrompt: body.trim(),
           location,
+          sourcePath: filePath,
+          // Optional fields - only include if defined
           ...frontmatter.color && { color: frontmatter.color },
-          // Only use model_name field, ignore deprecated 'model' field
-          ...frontmatter.model_name && { model_name: frontmatter.model_name }
+          ...frontmatter.model_name && { model_name: frontmatter.model_name },
+          ...disallowedTools && { disallowedTools },
+          ...permissionMode && { permissionMode },
+          ...skills && { skills },
+          ...memory && { memory },
+          ...frontmatter.maxThinkingTokens && {
+            maxThinkingTokens: Number(frontmatter.maxThinkingTokens)
+          },
+          ...frontmatter.hooks && { hooks: frontmatter.hooks }
         };
         agents.push(agent);
       } catch (error) {
@@ -101,12 +286,24 @@ async function loadPluginAgents() {
       for (const pluginAgent of plugin.agents) {
         try {
           const content = readFileSync(pluginAgent.filePath, "utf-8");
+          if (!content.trim()) continue;
           const { data: frontmatter, content: body } = matter(content);
           if (!frontmatter.name || !frontmatter.description) {
-            console.warn(
-              `Skipping plugin agent ${pluginAgent.filePath}: missing required fields (name, description)`
-            );
-            continue;
+            const headingMatch = body.match(/^#\s+(.+)/m);
+            const firstParagraph = body.split(/\n\n/).find((p) => p.trim() && !p.trim().startsWith("#"));
+            if (headingMatch) {
+              if (!frontmatter.name) {
+                frontmatter.name = headingMatch[1].trim();
+              }
+              if (!frontmatter.description) {
+                frontmatter.description = firstParagraph?.trim() || frontmatter.name;
+              }
+            } else {
+              console.warn(
+                `Skipping plugin agent ${pluginAgent.filePath}: missing required fields (name, description)`
+              );
+              continue;
+            }
           }
           if (frontmatter.model && !frontmatter.model_name && !warnedAgents.has(frontmatter.name) && process.env.MINTO_DEBUG_AGENTS) {
             console.warn(
@@ -114,6 +311,12 @@ async function loadPluginAgents() {
             );
             warnedAgents.add(frontmatter.name);
           }
+          const disallowedTools = parseDisallowedTools(
+            frontmatter.disallowedTools
+          );
+          const skills = parseSkills(frontmatter.skills);
+          const memory = parseMemory(frontmatter.memory);
+          const permissionMode = parsePermissionMode(frontmatter.permissionMode);
           const agent = {
             agentType: frontmatter.name,
             whenToUse: frontmatter.description.replace(/\\n/g, "\n"),
@@ -121,10 +324,21 @@ async function loadPluginAgents() {
             systemPrompt: body.trim(),
             location: "plugin",
             pluginName: plugin.manifest.name,
+            sourcePath: pluginAgent.filePath,
+            // Optional fields
             ...frontmatter.color && { color: frontmatter.color },
-            // Only use model_name field, ignore deprecated 'model' field
             ...frontmatter.model_name && {
               model_name: frontmatter.model_name
+            },
+            ...disallowedTools && { disallowedTools },
+            ...permissionMode && { permissionMode },
+            ...skills && { skills },
+            ...memory && { memory },
+            ...frontmatter.maxThinkingTokens && {
+              maxThinkingTokens: Number(frontmatter.maxThinkingTokens)
+            },
+            ...frontmatter.hooks && {
+              hooks: frontmatter.hooks
             }
           };
           agents.push(agent);
@@ -143,40 +357,59 @@ async function loadPluginAgents() {
 }
 async function loadAllAgents() {
   try {
-    const userMintoDir = join(homedir(), ".minto", "agents");
-    const projectMintoDir = join(getCwd(), ".minto", "agents");
-    const [pluginAgents, userMintoAgents, projectMintoAgents] = await Promise.all([
+    const home = homedir();
+    const cwd = getCwd();
+    const userClaudeDir = join(home, ".claude", "agents");
+    const userMintoDir = join(home, ".minto", "agents");
+    const projectClaudeDir = join(cwd, ".claude", "agents");
+    const projectMintoDir = join(cwd, ".minto", "agents");
+    const [
+      pluginAgents,
+      userClaudeAgents,
+      userMintoAgents,
+      projectClaudeAgents,
+      projectMintoAgents
+    ] = await Promise.all([
       loadPluginAgents(),
+      scanAgentDirectory(userClaudeDir, "user"),
       scanAgentDirectory(userMintoDir, "user"),
+      scanAgentDirectory(projectClaudeDir, "project"),
       scanAgentDirectory(projectMintoDir, "project")
     ]);
-    const builtinAgents = [BUILTIN_GENERAL_PURPOSE];
     const agentMap = /* @__PURE__ */ new Map();
-    for (const agent of builtinAgents) {
+    for (const agent of BUILTIN_AGENTS) {
       agentMap.set(agent.agentType, agent);
     }
     for (const agent of pluginAgents) {
       agentMap.set(agent.agentType, agent);
     }
+    for (const agent of userClaudeAgents) {
+      agentMap.set(agent.agentType, agent);
+    }
     for (const agent of userMintoAgents) {
       agentMap.set(agent.agentType, agent);
     }
+    for (const agent of projectClaudeAgents) {
+      agentMap.set(agent.agentType, agent);
+    }
     for (const agent of projectMintoAgents) {
       agentMap.set(agent.agentType, agent);
     }
     const activeAgents = Array.from(agentMap.values());
     const allAgents = [
-      ...builtinAgents,
+      ...BUILTIN_AGENTS,
       ...pluginAgents,
+      ...userClaudeAgents,
       ...userMintoAgents,
+      ...projectClaudeAgents,
       ...projectMintoAgents
     ];
     return { activeAgents, allAgents };
   } catch (error) {
     console.error("Failed to load agents, falling back to built-in:", error);
     return {
-      activeAgents: [BUILTIN_GENERAL_PURPOSE],
-      allAgents: [BUILTIN_GENERAL_PURPOSE]
+      activeAgents: [...BUILTIN_AGENTS],
+      allAgents: [...BUILTIN_AGENTS]
     };
   }
 }
@@ -207,8 +440,14 @@ const getAvailableAgentTypes = memoize(async () => {
 let watchers = [];
 async function startAgentWatcher(onChange) {
   await stopAgentWatcher();
-  const userMintoDir = join(homedir(), ".minto", "agents");
-  const projectMintoDir = join(getCwd(), ".minto", "agents");
+  const home = homedir();
+  const cwd = getCwd();
+  const directories = [
+    { path: join(home, ".claude", "agents"), label: "user/.claude" },
+    { path: join(home, ".minto", "agents"), label: "user/.minto" },
+    { path: join(cwd, ".claude", "agents"), label: "project/.claude" },
+    { path: join(cwd, ".minto", "agents"), label: "project/.minto" }
+  ];
   const watchDirectory = (dirPath, label) => {
     if (existsSync(dirPath)) {
       const watcher = watch(
@@ -228,8 +467,9 @@ async function startAgentWatcher(onChange) {
       watchers.push(watcher);
     }
   };
-  watchDirectory(userMintoDir, "user/.minto");
-  watchDirectory(projectMintoDir, "project/.minto");
+  for (const { path, label } of directories) {
+    watchDirectory(path, label);
+  }
 }
 async function stopAgentWatcher() {
   try {