dank-ai 1.0.33 → 1.0.35

package/lib/agent.js

@@ -64,7 +64,7 @@ class DankAgent {
   }
 
   /**
-   * Set instance type (small, medium, large, xlarge)
+   * Set instance type (any string value - validated by backend)
    * @param {string} instanceType - Instance type string
    */
   setInstanceType(instanceType) {
@@ -72,49 +72,17 @@ class DankAgent {
       throw new Error('Instance type must be a non-empty string');
     }
 
-    const normalizedType = instanceType.toLowerCase().trim();
-    
-    if (!INSTANCE_TYPES[normalizedType]) {
-      const validTypes = Object.keys(INSTANCE_TYPES).join(', ');
-      throw new Error(`Invalid instance type: "${instanceType}". Valid types are: ${validTypes}`);
-    }
-
-    this.config.instanceType = normalizedType;
+    // Store the instance type as-is (no validation - backend handles valid types)
+    this.config.instanceType = instanceType.trim();
     return this;
   }
 
   /**
-   * @deprecated Use setInstanceType() instead. This method is kept for backward compatibility.
-   * Set resource limits for the container
+   * @deprecated DISABLED - Use setInstanceType() instead.
+   * This method has been disabled. Please use setInstanceType('small'|'medium'|'large'|'xlarge') instead.
    */
   setResources(resources) {
-    // Map old resources format to instance type
-    if (resources && typeof resources === 'object') {
-      const memory = resources.memory || '512m';
-      const cpu = resources.cpu || 1;
-      
-      // Try to map to an instance type
-      let instanceType = 'small'; // default
-      
-      if (memory === '512m' && cpu === 1) {
-        instanceType = 'small';
-      } else if (memory === '1g' && cpu === 2) {
-        instanceType = 'medium';
-      } else if (memory === '2g' && cpu === 2) {
-        instanceType = 'large';
-      } else if (memory === '4g' && cpu === 4) {
-        instanceType = 'xlarge';
-      } else {
-        // For custom configurations, default to small and log a warning
-        console.warn(`⚠️  setResources() is deprecated. Using 'small' instance type. Please use setInstanceType('small'|'medium'|'large'|'xlarge') instead.`);
-        instanceType = 'small';
-      }
-      
-      return this.setInstanceType(instanceType);
-    }
-    
-    // If no resources provided, default to small
-    return this.setInstanceType('small');
+    throw new Error('setResources() has been disabled. Please use setInstanceType() instead. Example: .setInstanceType("small")');
   }
 
   /**
@@ -159,19 +127,25 @@ class DankAgent {
       port: Joi.number().min(1000).max(65535).default(3000),
       authentication: Joi.boolean().default(false),
       maxConnections: Joi.number().min(1).max(1000).default(50),
-      timeout: Joi.number().min(1000).default(30000)
+      timeout: Joi.number().min(1000).default(30000),
+      protocol: Joi.string().valid('http').optional() // Allow but ignore for backward compatibility
     });
 
-    const { error, value } = schema.validate(options);
+    const { error, value } = schema.validate(options, { 
+      stripUnknown: true // Strip unknown fields after validation
+    });
     if (error) {
       throw new Error(`Invalid prompting server configuration: ${error.message}`);
     }
+    
+    // Remove protocol from value if present (we always use HTTP now)
+    const { protocol, ...cleanValue } = value;
 
     // Set the port in docker config
-    this.config.docker = { ...this.config.docker, port: value.port };
+    this.config.docker = { ...this.config.docker, port: cleanValue.port };
 
     // Set the communication config (always HTTP, excluding port)
-    const { port, ...communicationConfig } = value;
+    const { port, ...communicationConfig } = cleanValue;
     this.config.communication = {
       ...this.config.communication,
       directPrompting: {
@@ -649,7 +623,7 @@ class DankAgent {
       
       prompt: Joi.string().optional(),
       
-      instanceType: Joi.string().valid('small', 'medium', 'large', 'xlarge').default('small'),
+      instanceType: Joi.string().default('small'), // Any string allowed - backend validates
       
       docker: Joi.object({
         baseImage: Joi.string().default(`${DOCKER_CONFIG.baseImagePrefix}:${DOCKER_CONFIG.defaultTag}`),

package/lib/cli/build.js

@@ -20,8 +20,8 @@ async function buildCommand(options) {
       
       console.log(chalk.green('\\n✅ Pull completed successfully!'));
     }
- 
 
+    process.exit(0);
   } catch (error) {
     console.error(chalk.red('❌ Pull failed:'), error.message);
     process.exit(1);

package/lib/cli/clean.js

@@ -21,6 +21,7 @@ async function cleanCommand(options) {
 
     console.log(chalk.green('\\n✅ Cleanup completed successfully!'));
 
+    process.exit(0);
   } catch (error) {
     console.error(chalk.red('❌ Cleanup failed:'), error.message);
     process.exit(1);

package/lib/cli/init.js

@@ -72,7 +72,7 @@ async function initCommand(projectName, options) {
       force: options.force
     });
 
-    // Initialize project structure
+    // Initialize project structure (creates directory if needed)
     await project.init();
 
     // Create package.json
@@ -95,6 +95,7 @@ async function initCommand(projectName, options) {
     console.log(chalk.gray('  4. Run "dank run" to start your agents'));
     console.log(chalk.gray('\nFor more information, visit: https://github.com/your-org/dank'));
 
+    process.exit(0);
   } catch (error) {
     console.error(chalk.red('❌ Initialization failed:'), error.message);
     process.exit(1);

package/lib/cli/production-build.js

@@ -131,6 +131,9 @@ async function productionBuildCommand(options) {
       throw new Error(`Configuration file not found: ${configPath}`);
     }
 
+    // Get project directory (directory containing the config file)
+    const projectDir = path.dirname(configPath);
+
     const config = require(configPath);
     if (!config.agents || !Array.isArray(config.agents)) {
       throw new Error('No agents found in configuration');
@@ -157,7 +160,8 @@ async function productionBuildCommand(options) {
           tagByAgent: Boolean(options.tagByAgent || agentImageConfig.tagByAgent),
           force: options.force || false,
           push: options.push || false,
-          baseImageOverride: options.baseImageOverride || null
+          baseImageOverride: options.baseImageOverride || null,
+          projectDir: projectDir  // Pass project directory so external files can be copied
         };
         
         const result = await dockerManager.buildProductionImage(agent, buildOptions);

package/lib/cli/run.js

@@ -23,6 +23,9 @@ async function runCommand(options) {
       throw new Error(`Configuration file not found: ${configPath}`);
     }
 
+    // Get project directory (directory containing the config file)
+    const projectDir = path.dirname(configPath);
+
     console.log(chalk.blue('📋 Loading configuration...'));
     
     // Clear require cache to get fresh config
@@ -67,7 +70,8 @@ async function runCommand(options) {
           console.log(chalk.gray(`  Starting ${agent.name}...`));
           
           const container = await dockerManager.startAgent(agent, {
-            rebuild: !options.noBuild  // Rebuild by default unless --no-build is specified
+            rebuild: !options.noBuild,  // Rebuild by default unless --no-build is specified
+            projectDir: projectDir  // Pass project directory so external files can be copied
           });
           
           console.log(chalk.green(`  ✅ ${agent.name} started (${container.id.substring(0, 12)})`));
@@ -98,6 +102,7 @@ async function runCommand(options) {
       console.log(chalk.cyan('\\n🔧 Agents running in detached mode'));
       console.log(chalk.gray('Use "dank status" to check agent status'));
       console.log(chalk.gray('Use "dank logs <agent>" to view logs'));
+      process.exit(0);
     } else {
       console.log(chalk.cyan('\\n👀 Monitoring agents (Ctrl+C to stop)...'));
       

package/lib/cli/stop.js

@@ -19,6 +19,7 @@ async function stopCommand(agents, options) {
       process.exit(1);
     }
 
+    process.exit(0);
   } catch (error) {
     console.error(chalk.red('❌ Stop failed:'), error.message);
     process.exit(1);

package/lib/config.js

@@ -77,15 +77,17 @@ class AgentConfig {
 
   /**
    * Get resources (memory, cpu) from instance type
-   * @param {string} instanceType - Instance type (small, medium, large, xlarge)
+   * @param {string} instanceType - Instance type (any string, defaults to 'small' if not found)
    * @returns {Object} Resources object with memory and cpu
    */
   static getResourcesFromInstanceType(instanceType) {
     const normalizedType = (instanceType || 'small').toLowerCase().trim();
     const instanceConfig = INSTANCE_TYPES[normalizedType];
     
+    // If instance type not found in mapping, default to 'small'
+    // Backend will handle the actual resource allocation
     if (!instanceConfig) {
-      throw new Error(`Invalid instance type: "${instanceType}". Valid types are: ${Object.keys(INSTANCE_TYPES).join(', ')}`);
+      return INSTANCE_TYPES.small; // Default to small resources
     }
     
     return {

package/lib/docker/manager.js

@@ -1170,7 +1170,9 @@ class DockerManager {
     agent.finalize();
 
     try {
-      const buildContext = await this.createAgentBuildContext(agent);
+      const buildContext = await this.createAgentBuildContext(agent, {
+        projectDir: options.projectDir
+      });
       const dockerCmd = await this.resolveDockerCommand();
 
       const buildCommand = [
@@ -1221,6 +1223,7 @@ class DockerManager {
       force = false,
       push = false,
       baseImageOverride = null, // Production-only: override base image for all agents
+      projectDir = null, // Project directory to copy files from
     } = options;
 
     // Normalize all components
@@ -1259,7 +1262,8 @@ class DockerManager {
     try {
       const buildContext = await this.createAgentBuildContext(agent, { 
         isProductionBuild: true,
-        baseImageOverride: baseImageOverride
+        baseImageOverride: baseImageOverride,
+        projectDir: projectDir
       });
       const dockerCmd = await this.resolveDockerCommand();
 
@@ -1417,7 +1421,9 @@ class DockerManager {
       // Check if agent image exists, build if necessary
       const hasImage = await this.hasImage(imageName);
       if (!hasImage || options.rebuild) {
-        await this.buildAgentImage(agent, options);
+        await this.buildAgentImage(agent, {
+          projectDir: options.projectDir
+        });
       }
 
       // Prepare container configuration
@@ -1617,6 +1623,66 @@ class DockerManager {
     return tarPath;
   }
 
+  /**
+   * Copy project files to build context (excluding common ignore patterns)
+   */
+  async copyProjectFiles(projectDir, contextDir) {
+    const agentCodeDir = path.join(contextDir, "agent-code");
+    await fs.ensureDir(agentCodeDir);
+    
+    // Patterns to exclude when copying project files
+    const ignorePatterns = [
+      'node_modules',
+      '.git',
+      '.build-context-*',
+      '.env',
+      '.env.*',
+      '*.log',
+      '.DS_Store',
+      'dist',
+      'build',
+      '.dank',
+      'coverage',
+      '.nyc_output'
+    ];
+    
+    try {
+      // Copy all files from project directory, filtering out ignored patterns
+      const items = await fs.readdir(projectDir);
+      
+      for (const item of items) {
+        const sourcePath = path.join(projectDir, item);
+        const destPath = path.join(agentCodeDir, item);
+        const stat = await fs.stat(sourcePath);
+        
+        // Skip if matches ignore pattern
+        const shouldIgnore = ignorePatterns.some(pattern => {
+          if (pattern.includes('*')) {
+            const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$');
+            return regex.test(item);
+          }
+          return item === pattern;
+        });
+        
+        if (shouldIgnore) {
+          continue;
+        }
+        
+        // Copy file or directory
+        if (stat.isDirectory()) {
+          await fs.copy(sourcePath, destPath);
+        } else if (stat.isFile()) {
+          await fs.copy(sourcePath, destPath);
+        }
+      }
+      
+      this.logger.info(`📁 Copied project files from ${projectDir} to build context`);
+    } catch (error) {
+      this.logger.warn(`⚠️  Failed to copy project files: ${error.message}`);
+      // Don't fail the build if copying project files fails
+    }
+  }
+
   /**
    * Create build context for agent
    */
@@ -1626,6 +1692,12 @@ class DockerManager {
       `../../.build-context-${agent.name}`
     );
     await fs.ensureDir(contextDir);
+    
+    // Copy project files if project directory is provided
+    // This allows handlers to reference functions from other files
+    if (options.projectDir) {
+      await this.copyProjectFiles(options.projectDir, contextDir);
+    }
 
     // Get the base image for this agent
     // Production builds can override the base image via baseImageOverride option
@@ -1680,10 +1752,20 @@ USER dankuser
     const handlersCode = this.generateHandlersCode(agent);
     const routesCode = this.generateRoutesCode(agent);
 
+    // Check if project files were copied (indicated by presence of files other than index.js)
+    const hasProjectFiles = options.projectDir ? true : false;
+    const projectFilesNote = hasProjectFiles 
+      ? `// Note: Project files from your project directory have been copied here.
+// You can require them in your handlers using relative paths.
+// Example: const { myFunction } = require('./utils');`
+      : '';
+
     const agentCode = `
 // Agent: ${agent.name}
 // Generated by Dank Agent Service
 
+${projectFilesNote}
+
 module.exports = {
   async main(context) {
     const { llmClient, handlers, tools, config } = context;
@@ -1693,7 +1775,7 @@ module.exports = {
     // Basic agent loop
     setInterval(async () => {
       try {
-        // Trigger heartbeat
+        // Trigger heartbeat handlers (no logging)
         const heartbeatHandlers = handlers.get('heartbeat') || [];
         heartbeatHandlers.forEach(handler => {
           try {
@@ -1703,9 +1785,6 @@ module.exports = {
           }
         });
         
-        // Custom agent logic would go here
-        console.log('Agent ${agent.name} heartbeat - uptime:', Math.floor(process.uptime()), 'seconds');
-        
       } catch (error) {
         console.error('Agent loop error:', error);
         const errorHandlers = handlers.get('error') || [];

package/lib/project.js

@@ -24,8 +24,8 @@ class DankProject {
   async init() {
     const projectDir = this.projectPath;
     
-    // Create directory structure (if needed)
-    // await fs.ensureDir(path.join(projectDir, this.options.outputDir));
+    // Create project directory if it doesn't exist
+    await fs.ensureDir(projectDir);
     
     // Create example config file
     const exampleConfig = this._generateExampleConfig();
@@ -82,7 +82,6 @@ module.exports = {
       .setPrompt('You are a helpful AI assistant. Be concise and friendly in your responses.')
       .setBaseImage('nodejs-20')
       .setPromptingServer({
-        protocol: 'http',
         port: 3000
       })
       .setInstanceType('small')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dank-ai",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "Dank Agent Service - Docker-based AI agent orchestration platform",
   "main": "lib/index.js",
   "exports": {