agent-window 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-window",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A window to interact with AI agents through chat interfaces. Simplified interaction, powerful backend capabilities.",
   "type": "module",
   "main": "src/bot.js",

package/src/bot.js

@@ -49,6 +49,7 @@ const ALLOWED_CHANNELS = config.discord.allowedChannels;
 const CHANNEL_SESSIONS_FILE = config.paths.sessions;
 const PENDING_DIR = config.paths.pending;
 const HOOK_DIR = config.paths.hooks;
+const USE_DOCKER = config.workspace.useDocker; // Whether to use Docker or run locally
 const CONTAINER_NAME = config.workspace.containerName;
 const DOCKER_IMAGE = config.workspace.dockerImage;
 
@@ -118,20 +119,37 @@ function updateHealthStatus(component, status) {
 
 // Get overall health status
 function getOverallHealth() {
-  const checks = [
-    healthStatus.pm2 ? '✓' : '✗',
-    healthStatus.discord ? '✓' : '✗',
-    healthStatus.docker ? '✓' : '✗'
-  ].join(' ');
-
-  if (healthStatus.pm2 && healthStatus.discord && healthStatus.docker) {
-    return 'healthy';
-  } else if (healthStatus.pm2 && healthStatus.discord) {
-    return 'degraded'; // Running but Docker failed
-  } else if (healthStatus.pm2) {
-    return 'unhealthy'; // PM2 running but Discord disconnected
+  // Build health check string
+  const checks = [healthStatus.pm2 ? '✓' : '✗', healthStatus.discord ? '✓' : '✗'];
+
+  // Only check Docker if enabled
+  if (USE_DOCKER) {
+    checks.push(healthStatus.docker ? '✓' : '✗');
+  }
+
+  const healthString = checks.join(' ');
+
+  // Determine overall status
+  if (USE_DOCKER) {
+    // Docker mode: all components must be healthy
+    if (healthStatus.pm2 && healthStatus.discord && healthStatus.docker) {
+      return 'healthy';
+    } else if (healthStatus.pm2 && healthStatus.discord) {
+      return 'degraded'; // Running but Docker failed
+    } else if (healthStatus.pm2) {
+      return 'unhealthy'; // PM2 running but Discord disconnected
+    } else {
+      return 'failed';
+    }
   } else {
-    return 'failed';
+    // Non-Docker mode: only PM2 and Discord required
+    if (healthStatus.pm2 && healthStatus.discord) {
+      return 'healthy';
+    } else if (healthStatus.pm2) {
+      return 'unhealthy'; // PM2 running but Discord disconnected
+    } else {
+      return 'failed';
+    }
   }
 }
 
@@ -346,6 +364,13 @@ function isContainerRunning() {
 
 // Start or ensure persistent container is running
 function ensureContainer() {
+  // Skip Docker operations if not using Docker
+  if (!USE_DOCKER) {
+    console.log('[Docker] Docker is disabled (useDocker: false). Running in local mode.');
+    updateHealthStatus('docker', true); // Mark as "healthy" since we don't need Docker
+    return true;
+  }
+
   // Log the paths being used
   console.log('[Docker] PENDING_DIR (host):', PENDING_DIR);
   console.log('[Docker] HOOK_DIR (host):', HOOK_DIR);
@@ -437,6 +462,11 @@ function ensureContainer() {
 
 // Stop persistent container (call on bot shutdown)
 function stopContainer() {
+  if (!USE_DOCKER) {
+    console.log('[Docker] Docker is disabled. No container to stop.');
+    return;
+  }
+
   try {
     execSync(`docker stop ${CONTAINER_NAME} 2>/dev/null`);
     execSync(`docker rm ${CONTAINER_NAME} 2>/dev/null`);
@@ -1445,21 +1475,42 @@ const commands = {
         let lastStatusUpdate = 0;
         const task = activeTasks.get(channelId);
 
-        // Use docker exec to run CLI in the persistent container
-        const dockerArgs = [
-          'exec', '-i',
-          CONTAINER_NAME,
-          CLI_COMMAND,
-          ...cliArgs
-        ];
+        // Execute CLI command (either in Docker or locally based on configuration)
+        let child;
 
-        console.log('[Docker] Executing in container:', CONTAINER_NAME);
+        if (USE_DOCKER) {
+          // Use docker exec to run CLI in the persistent container
+          const dockerArgs = [
+            'exec', '-i',
+            CONTAINER_NAME,
+            CLI_COMMAND,
+            ...cliArgs
+          ];
 
-        const child = spawn('docker', dockerArgs, {
-          stdio: ['pipe', 'pipe', 'pipe'],
-        });
+          console.log('[Docker] Executing in container:', CONTAINER_NAME);
+
+          child = spawn('docker', dockerArgs, {
+            stdio: ['pipe', 'pipe', 'pipe'],
+          });
 
-        child.stdin.end();
+          child.stdin.end();
+        } else {
+          // Run CLI directly on local host
+          console.log('[Local] Executing locally:', CLI_COMMAND, ...cliArgs);
+
+          child = spawn(CLI_COMMAND, cliArgs, {
+            stdio: ['pipe', 'pipe', 'pipe'],
+            cwd: PROJECT_DIR,
+            env: {
+              ...process.env,
+              CLAUDE_CODE_OAUTH_TOKEN: OAUTH_TOKEN || '',
+              HOME: process.env.HOME,
+              PATH: process.env.PATH
+            }
+          });
+
+          child.stdin.end();
+        }
 
         // Update status periodically (with stop button)
         // forceUpdate=true bypasses throttle for important state changes
@@ -1762,18 +1813,9 @@ client.on(Events.MessageCreate, async (message) => {
     return;
   }
 
-  // SECURITY: Validate channel access
-  // - If ALLOWED_CHANNELS is set, only allow those channels
-  // - If ALLOWED_CHANNELS is missing (should not happen due to config validation), reject ALL non-DM messages
-  if (!isDM) {
-    if (!ALLOWED_CHANNELS || ALLOWED_CHANNELS.length === 0) {
-      // Defensive: If no channels are configured, reject all non-DM messages
-      console.error('[MSG] SECURITY: No ALLOWED_CHANNELS configured. Rejecting message for safety.');
-      console.error('[MSG] Please configure ALLOWED_CHANNELS in your config.json');
-      return;
-    }
+  if (ALLOWED_CHANNELS && !isDM) {
     if (!ALLOWED_CHANNELS.includes(message.channel.id)) {
-      console.log(`[MSG] Ignored: channel ${message.channel.id} not in allowed list`);
+      console.log('[MSG] Ignored: channel not allowed');
       return;
     }
   }
@@ -1853,9 +1895,14 @@ client.on(Events.ClientReady, async () => {
   // Send startup notification to Discord channels
   try {
     const uptime = Math.floor((Date.now() - healthStatus.startTime) / 1000);
-    const dockerStatus = healthStatus.docker ? '✓ Connected' : '✗ Not Available';
     const overallStatus = overallHealth.toUpperCase();
 
+    // Build execution mode info
+    const execMode = USE_DOCKER ? 'Docker Container' : 'Local Host';
+    const dockerStatus = USE_DOCKER
+      ? (healthStatus.docker ? '✓ Connected' : '✗ Not Available')
+      : '⊘ Disabled (Local Mode)';
+
     // Build startup message
     const startupMessage = {
       embeds: [{
@@ -1867,6 +1914,11 @@ client.on(Events.ClientReady, async () => {
             value: overallStatus,
             inline: true
           },
+          {
+            name: 'Execution Mode',
+            value: execMode,
+            inline: true
+          },
           {
             name: 'Docker',
             value: dockerStatus,
@@ -1879,7 +1931,9 @@ client.on(Events.ClientReady, async () => {
           },
           {
             name: 'Components',
-            value: `PM2: ✓\nDiscord: ✓\nDocker: ${healthStatus.docker ? '✓' : '✗'}`,
+            value: USE_DOCKER
+              ? `PM2: ✓\nDiscord: ✓\nDocker: ${healthStatus.docker ? '✓' : '✗'}`
+              : `PM2: ✓\nDiscord: ✓\nDocker: ⊘ (Local Mode)`,
             inline: false
           }
         ],

package/src/core/config.js

@@ -81,6 +81,7 @@ function loadConfig() {
     // === Workspace Configuration ===
     workspace: {
       projectDir: expandPath(fileConfig.PROJECT_DIR) || process.cwd(),
+      useDocker: fileConfig.workspace?.useDocker !== false, // Default to true for backward compatibility
       containerName: fileConfig.workspace?.containerName || 'claude-discord-bot',
       dockerImage: fileConfig.workspace?.dockerImage || 'claude-sandbox',
       portMappings: fileConfig.workspace?.portMappings || [],