Merge pull request #8 from tyom/fix-packaging

Add dev mode for bots and fix production bot spawning

Author: tyom

apps/electron/electron.js

@@ -203,13 +203,7 @@ function getEmulatorConfig() {
   if (useDevServer) {
     // Dev mode: run the Slack plugin's server directly
     // The server/index.ts has `if (import.meta.main)` to run when executed directly
-    const slackPackageDir = path.join(
-      appRoot,
-      '..',
-      '..',
-      'packages',
-      'slack'
-    )
+    const slackPackageDir = path.join(appRoot, '..', '..', 'packages', 'slack')
     return {
       type: 'bun',
       bunPath: 'bun',
@@ -256,15 +250,98 @@ function readBotsManifest() {
   }
 }
 
+/**
+ * Read bots.json and resolve dev-mode configs (run from source via bun).
+ * Mirrors the resolution logic in compile-bots.ts.
+ */
+function readBotsJsonDev() {
+  const botsJsonPath = path.join(appRoot, 'bots.json')
+  if (!fs.existsSync(botsJsonPath)) {
+    electronLogger.info('No bots.json found for dev mode')
+    return []
+  }
+
+  let config
+  try {
+    config = JSON.parse(fs.readFileSync(botsJsonPath, 'utf-8'))
+  } catch (err) {
+    electronLogger.error({ err }, 'Failed to parse bots.json')
+    return []
+  }
+
+  const entries = config.bots ?? []
+  const results = []
+
+  for (const entry of entries) {
+    const source = typeof entry === 'string' ? entry : entry.source
+    if (!source) {
+      electronLogger.error({ entry }, 'Bot entry missing source path')
+      continue
+    }
+    const sourcePath = path.resolve(appRoot, source)
+    const entryFile =
+      (typeof entry === 'object' ? entry.entry : undefined) ?? 'src/app.ts'
+
+    // Determine bot name: explicit override or from config.yaml simulator.id
+    let name
+    if (typeof entry === 'object' && entry.name) {
+      name = entry.name
+    } else {
+      const configYamlPath = path.join(sourcePath, 'config.yaml')
+      if (fs.existsSync(configYamlPath)) {
+        const yamlContent = fs.readFileSync(configYamlPath, 'utf-8')
+        const match = yamlContent.match(/^simulator:\s*\n\s+id:\s*(.+)/m)
+        if (match) {
+          name = match[1].trim()
+        }
+      }
+    }
+
+    if (!name) {
+      electronLogger.error(
+        { source },
+        'Cannot determine bot name (no name override and no simulator.id in config.yaml)'
+      )
+      continue
+    }
+
+    const script = path.join(sourcePath, entryFile)
+    if (!fs.existsSync(script)) {
+      electronLogger.error({ script }, 'Bot entry point not found')
+      continue
+    }
+
+    results.push({
+      type: 'bun',
+      bunPath: 'bun',
+      script,
+      cwd: sourcePath,
+      name,
+    })
+  }
+
+  return results
+}
+
 /**
  * Get bot configurations for starting
- * Reads from manifest.json generated by compile-bots.ts
- * Returns configs for compiled binaries
+ * In dev mode: reads bots.json and runs from source via bun
+ * In production: reads manifest.json for compiled binaries
  */
 function getBotConfigs() {
-  const botsManifest = readBotsManifest()
   const isPackaged = app.isPackaged
 
+  if (!isPackaged) {
+    const devConfigs = readBotsJsonDev()
+    electronLogger.info(
+      { count: devConfigs.length, isPackaged },
+      'getBotConfigs called (dev mode)'
+    )
+    return devConfigs
+  }
+
+  const botsManifest = readBotsManifest()
+
   electronLogger.info({ botsManifest, isPackaged }, 'getBotConfigs called')
 
   if (botsManifest.length === 0) {
@@ -273,9 +350,7 @@ function getBotConfigs() {
   }
 
   // Use compiled binaries from manifest
-  const botsDir = isPackaged
-    ? path.join(process.resourcesPath, 'bots')
-    : path.join(appRoot, 'dist', 'bots')
+  const botsDir = path.join(process.resourcesPath, 'bots')
 
   return botsManifest
     .map((bot) => {
@@ -355,10 +430,19 @@ function settingsToEnv(settings) {
 
   // Track all vars injected by the emulator (from UI settings, not user's .env file)
   // This allows bots to distinguish between UI-derived env vars and actual .env overrides
-  const injectedVars = []
+  const injectedVars = [
+    'SLACK_BOT_TOKEN',
+    'SLACK_APP_TOKEN',
+    'SLACK_SIGNING_SECRET',
+  ]
 
   const env = {
     SLACK_API_URL: `http://localhost:${EMULATOR_PORT}/api`,
+    // Provide placeholder Slack tokens so bots pass env validation.
+    // Real tokens aren't needed — bots always talk to the emulator.
+    SLACK_BOT_TOKEN: 'xoxb-emulator',
+    SLACK_APP_TOKEN: 'xapp-emulator',
+    SLACK_SIGNING_SECRET: 'emulator',
     DATA_DIR: dataDir,
   }
 
@@ -543,6 +627,7 @@ function spawnProcess(config, env, label, forwardLogs = false) {
     proc = spawn(config.path, [], {
       env: { ...childEnv, ...env },
       stdio: ['ignore', 'pipe', 'pipe'],
+      cwd: app.getPath('userData'),
     })
   }
 

apps/electron/package.json

@@ -43,7 +43,9 @@
       {
         "from": "../ui/dist",
         "to": "dist",
-        "filter": ["**/*"]
+        "filter": [
+          "**/*"
+        ]
       },
       "assets/**/*",
       "package.json"