update mcp and skills

Author: idoubi

package.json

@@ -1,7 +1,7 @@
 {
   "name": "workany",
   "private": true,
-  "version": "0.1.11",
+  "version": "0.1.12",
   "type": "module",
   "scripts": {
     "ver": "./scripts/version.sh",

src-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workany-api",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "type": "module",
   "scripts": {
     "dev": "node --import tsx --watch src/index.ts",

src-api/src/app/api/agent.ts

@@ -82,7 +82,18 @@ agent.post('/execute', async (c) => {
     taskId?: string;
     modelConfig?: { apiKey?: string; baseUrl?: string; model?: string };
     sandboxConfig?: SandboxConfig;
-    skillsPath?: string;
+    skillsConfig?: {
+      enabled: boolean;
+      userDirEnabled: boolean;
+      appDirEnabled: boolean;
+      skillsPath?: string;
+    };
+    mcpConfig?: {
+      enabled: boolean;
+      userDirEnabled: boolean;
+      appDirEnabled: boolean;
+      mcpConfigPath?: string;
+    };
   }>();
 
   console.log('[AgentAPI] POST /execute received:', {
@@ -94,6 +105,8 @@ agent.post('/execute', async (c) => {
           provider: body.sandboxConfig.provider,
         }
       : null,
+    skillsConfig: body.skillsConfig,
+    mcpConfig: body.mcpConfig,
   });
 
   if (!body.planId) {
@@ -115,7 +128,8 @@ agent.post('/execute', async (c) => {
       body.taskId,
       body.modelConfig,
       body.sandboxConfig,
-      body.skillsPath
+      body.skillsConfig,
+      body.mcpConfig
     )
   );
 
@@ -174,7 +188,8 @@ agent.post('/', async (c) => {
       body.modelConfig,
       body.sandboxConfig,
       body.images,
-      body.skillsPath
+      body.skillsConfig,
+      body.mcpConfig
     )
   );
 

src-api/src/core/agent/types.ts

@@ -106,6 +106,34 @@ export interface AgentConfig {
   providerConfig?: Record<string, unknown>;
 }
 
+/**
+ * Skills configuration for loading skills from different directories
+ */
+export interface SkillsConfig {
+  /** Whether skills are globally enabled */
+  enabled: boolean;
+  /** Whether to load skills from user directory (~/.claude/skills) */
+  userDirEnabled: boolean;
+  /** Whether to load skills from app directory (workspace/skills) */
+  appDirEnabled: boolean;
+  /** Custom skills directory path (legacy support) */
+  skillsPath?: string;
+}
+
+/**
+ * MCP configuration for loading MCP servers from different config files
+ */
+export interface McpConfig {
+  /** Whether MCP is globally enabled */
+  enabled: boolean;
+  /** Whether to load MCP servers from user directory (claude config) */
+  userDirEnabled: boolean;
+  /** Whether to load MCP servers from app directory (workany config) */
+  appDirEnabled: boolean;
+  /** Custom MCP config file path (legacy support) */
+  mcpConfigPath?: string;
+}
+
 export interface AgentOptions {
   /** Session ID for continuing conversations */
   sessionId?: string;
@@ -125,8 +153,10 @@ export interface AgentOptions {
   sandbox?: SandboxConfig;
   /** Image attachments for vision capabilities */
   images?: ImageAttachment[];
-  /** Custom skills directory path */
-  skillsPath?: string;
+  /** Skills configuration */
+  skillsConfig?: SkillsConfig;
+  /** MCP configuration */
+  mcpConfig?: McpConfig;
 }
 
 export interface PlanOptions extends AgentOptions {

src-api/src/extensions/agent/claude/index.ts

@@ -37,7 +37,9 @@ import type {
   ConversationMessage,
   ExecuteOptions,
   ImageAttachment,
+  McpConfig,
   PlanOptions,
+  SkillsConfig,
 } from '@/core/agent/types';
 import {
   DEFAULT_API_HOST,
@@ -891,6 +893,37 @@ export class ClaudeAgent extends BaseAgent {
     });
   }
 
+  /**
+   * Build settingSources based on skillsConfig
+   * Controls which skill directories are loaded by the Claude Agent SDK
+   */
+  private buildSettingSources(skillsConfig?: SkillsConfig): ('user' | 'project')[] {
+    // If skillsConfig is not provided or skills are globally disabled, use minimal sources
+    if (!skillsConfig || !skillsConfig.enabled) {
+      logger.info('[ClaudeAgent] Skills disabled or no config, using project only');
+      return ['project'];
+    }
+
+    const sources: ('user' | 'project')[] = [];
+
+    // 'user' source loads skills from ~/.claude/skills
+    if (skillsConfig.userDirEnabled) {
+      sources.push('user');
+    }
+
+    // 'project' source loads skills from project directory
+    // Always include project for project-specific settings
+    sources.push('project');
+
+    // Note: App directory skills (workspace/skills) are handled separately
+    // as they are not part of the standard Claude SDK settingSources
+    if (skillsConfig.appDirEnabled) {
+      logger.info('[ClaudeAgent] App directory skills enabled (handled via custom skill loading)');
+    }
+
+    return sources.length > 0 ? sources : ['project'];
+  }
+
   /**
    * Build environment variables for the SDK query
    * Supports custom API endpoint and API key (including OpenRouter)
@@ -1123,21 +1156,24 @@ User's request (answer this AFTER reading the images):
     if (!claudeCodePath) {
       yield {
         type: 'error',
-        message:
-          'Claude Code is not installed. Please install it with: npm install -g @anthropic-ai/claude-code',
+        message: '__CLAUDE_CODE_NOT_FOUND__',
       };
       yield { type: 'done' };
       return;
     }
 
-    // Load user-configured MCP servers from ~/.workany/mcp.json
-    const userMcpServers = await loadMcpServers();
+    // Load user-configured MCP servers based on mcpConfig settings
+    const userMcpServers = await loadMcpServers(options?.mcpConfig as McpConfig | undefined);
 
     // Build query options
-    // Always use ['user', 'project'] to load skills and MCP from user's ~/.claude directory
+    // Use settingSources based on skillsConfig to control skill loading
+    // - 'user' source loads from ~/.claude directory (User skills)
+    // - 'project' source loads from project/.claude directory
     // User's custom API settings from WorkAny settings page are passed via env config
     // which takes priority over ~/.claude/settings.json because we set ANTHROPIC_API_KEY directly
-    const settingSources: ('user' | 'project')[] = ['user', 'project'];
+    const settingSources: ('user' | 'project')[] = this.buildSettingSources(options?.skillsConfig);
+    logger.info(`[Claude ${session.id}] Skills config:`, options?.skillsConfig);
+    logger.info(`[Claude ${session.id}] Setting sources: ${settingSources.join(', ')}`);
 
     const queryOptions: Options = {
       cwd: sessionCwd,
@@ -1225,13 +1261,31 @@ User's request (answer this AFTER reading the images):
         },
       });
 
-      // Show simple user-friendly error message
-      // Detailed error info is already logged to file
-      const logPath = '~/.workany/logs/workany.log';
-      yield {
-        type: 'error',
-        message: `__INTERNAL_ERROR__|${logPath}`,
-      };
+      // Check for API key related errors
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      const isApiKeyError =
+        errorMessage.includes('Invalid API key') ||
+        errorMessage.includes('invalid_api_key') ||
+        errorMessage.includes('API key') ||
+        errorMessage.includes('authentication') ||
+        errorMessage.includes('Please run /login') ||
+        errorMessage.includes('Unauthorized') ||
+        errorMessage.includes('401');
+
+      if (isApiKeyError) {
+        yield {
+          type: 'error',
+          message: '__API_KEY_ERROR__',
+        };
+      } else {
+        // Show simple user-friendly error message
+        // Detailed error info is already logged to file
+        const logPath = '~/.workany/logs/workany.log';
+        yield {
+          type: 'error',
+          message: `__INTERNAL_ERROR__|${logPath}`,
+        };
+      }
     } finally {
       this.sessions.delete(session.id);
       yield { type: 'done' };
@@ -1274,8 +1328,7 @@ If you need to create any files during planning, use this directory.
     if (!claudeCodePath) {
       yield {
         type: 'error',
-        message:
-          'Claude Code is not installed. Please install it with: npm install -g @anthropic-ai/claude-code',
+        message: '__CLAUDE_CODE_NOT_FOUND__',
       };
       yield { type: 'done' };
       return;
@@ -1427,19 +1480,20 @@ If you need to create any files during planning, use this directory.
     if (!claudeCodePath) {
       yield {
         type: 'error',
-        message:
-          'Claude Code is not installed. Please install it with: npm install -g @anthropic-ai/claude-code',
+        message: '__CLAUDE_CODE_NOT_FOUND__',
       };
       yield { type: 'done' };
       return;
     }
 
-    // Load user-configured MCP servers from ~/.workany/mcp.json
-    const userMcpServers = await loadMcpServers();
+    // Load user-configured MCP servers based on mcpConfig settings
+    const userMcpServers = await loadMcpServers(options.mcpConfig as McpConfig | undefined);
 
     // Build query options
-    // Always use ['user', 'project'] to load skills and MCP from user's ~/.claude directory
-    const execSettingSources: ('user' | 'project')[] = ['user', 'project'];
+    // Use settingSources based on skillsConfig to control skill loading
+    const execSettingSources: ('user' | 'project')[] = this.buildSettingSources(options.skillsConfig);
+    logger.info(`[Claude ${session.id}] Execute skills config:`, options.skillsConfig);
+    logger.info(`[Claude ${session.id}] Execute setting sources: ${execSettingSources.join(', ')}`);
 
     const queryOptions: Options = {
       cwd: sessionCwd,

src-api/src/shared/mcp/loader.ts

@@ -106,20 +106,50 @@ async function loadMcpServersFromFile(
   }
 }
 
+/**
+ * MCP configuration interface
+ */
+export interface McpConfig {
+  enabled: boolean;
+  userDirEnabled: boolean;
+  appDirEnabled: boolean;
+  mcpConfigPath?: string;
+}
+
 /**
  * Load MCP servers configuration from multiple sources:
- * - ~/.workany/mcp.json (WorkAny specific)
- * - ~/.claude/settings.json (Claude Code system config)
+ * - ~/.workany/mcp.json (WorkAny specific / App directory)
+ * - ~/.claude/settings.json (Claude Code system config / User directory)
  *
+ * @param mcpConfig Optional config to filter which sources to load
  * @returns Record of server name to config, merged from all sources
  */
-export async function loadMcpServers(): Promise<
-  Record<string, McpServerConfig>
-> {
+export async function loadMcpServers(
+  mcpConfig?: McpConfig
+): Promise<Record<string, McpServerConfig>> {
+  // If MCP is globally disabled, return empty
+  if (mcpConfig && !mcpConfig.enabled) {
+    console.log('[MCP] MCP disabled globally, skipping server load');
+    return {};
+  }
+
   const configPaths = getMcpConfigPaths();
   const allServers: Record<string, McpServerConfig> = {};
 
   for (const { name, path: configPath } of configPaths) {
+    // Filter based on mcpConfig settings
+    if (mcpConfig) {
+      // 'workany' = App directory, 'claude' = User directory
+      if (name === 'workany' && mcpConfig.appDirEnabled === false) {
+        console.log('[MCP] App directory MCP disabled, skipping workany config');
+        continue;
+      }
+      if (name === 'claude' && mcpConfig.userDirEnabled === false) {
+        console.log('[MCP] User directory MCP disabled, skipping claude config');
+        continue;
+      }
+    }
+
     const servers = await loadMcpServersFromFile(configPath, name);
     // Merge servers, workany config takes precedence over claude
     Object.assign(allServers, servers);

src-api/src/shared/services/agent.ts

@@ -14,7 +14,9 @@ import {
   type ConversationMessage,
   type IAgent,
   type ImageAttachment,
+  type McpConfig,
   type SandboxConfig,
+  type SkillsConfig,
   type TaskPlan,
 } from '@/core/agent';
 // ============================================================================
@@ -173,7 +175,8 @@ export async function* runExecutionPhase(
   taskId?: string,
   modelConfig?: { apiKey?: string; baseUrl?: string; model?: string },
   sandboxConfig?: SandboxConfig,
-  skillsPath?: string
+  skillsConfig?: SkillsConfig,
+  mcpConfig?: McpConfig
 ): AsyncGenerator<AgentMessage> {
   const agent = getAgent(modelConfig);
 
@@ -194,6 +197,8 @@ export async function* runExecutionPhase(
     sandboxProvider: sandboxConfig?.provider,
     apiEndpoint: sandboxConfig?.apiEndpoint,
   });
+  serviceLogger.info('[AgentService] runExecutionPhase skills config:', skillsConfig);
+  serviceLogger.info('[AgentService] runExecutionPhase mcp config:', mcpConfig);
 
   for await (const message of agent.execute({
     planId,
@@ -204,7 +209,8 @@ export async function* runExecutionPhase(
     taskId,
     abortController: session.abortController,
     sandbox: sandboxConfig,
-    skillsPath,
+    skillsConfig,
+    mcpConfig,
   })) {
     yield message;
   }
@@ -222,7 +228,8 @@ export async function* runAgent(
   modelConfig?: { apiKey?: string; baseUrl?: string; model?: string },
   sandboxConfig?: SandboxConfig,
   images?: ImageAttachment[],
-  skillsPath?: string
+  skillsConfig?: SkillsConfig,
+  mcpConfig?: McpConfig
 ): AsyncGenerator<AgentMessage> {
   const agent = getAgent(modelConfig);
 
@@ -233,6 +240,8 @@ export async function* runAgent(
     sandboxProvider: sandboxConfig?.provider,
     apiEndpoint: sandboxConfig?.apiEndpoint,
   });
+  serviceLogger.info('[AgentService] runAgent called with skills config:', skillsConfig);
+  serviceLogger.info('[AgentService] runAgent called with mcp config:', mcpConfig);
 
   for await (const message of agent.run(prompt, {
     sessionId: session.id,
@@ -242,7 +251,8 @@ export async function* runAgent(
     abortController: session.abortController,
     sandbox: sandboxConfig,
     images,
-    skillsPath,
+    skillsConfig,
+    mcpConfig,
   })) {
     yield message;
   }
@@ -267,4 +277,6 @@ export type {
   AgentConfig,
   IAgent,
   ImageAttachment,
+  SkillsConfig,
+  McpConfig,
 };