openbot 0.4.6 → 0.5.4

package/dist/app/server.js

@@ -8,7 +8,8 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
 import { generateId } from 'melony';
-import { DEFAULT_BASE_DIR, loadConfig, resolvePath } from '../app/config.js';
+import { getBaseDir, loadConfig } from '../app/config.js';
+import { isCloudMode, getCloudIntegrationsConfig } from './cloud-mode.js';
 import { processService } from '../services/process.js';
 import { runAgent, STATE_AGENT_ID, ORCHESTRATOR_AGENT_ID } from '../harness/index.js';
 import { initPlugins } from '../services/plugins/registry.js';
@@ -16,7 +17,7 @@ import { storageService } from '../plugins/storage/service.js';
 import { buildWorkspaceFileUrl, getPublicBaseUrl, openChannelFileStream, } from '../plugins/storage/files.js';
 import { ensureEventId, openBotEventFromQuery } from './utils.js';
 import { abortRegistry, abortKey } from '../services/abort.js';
-import { resolveRespondingAgentId } from './responding-agent.js';
+import { resolvePublishTargetAgentId, resolveRespondingAgentId } from './responding-agent.js';
 import { DEFAULT_UNCATEGORIZED_SPEC, UNCATEGORIZED_CHANNEL_ID, } from './channel-ids.js';
 export async function startServer(options = {}) {
     const publishEventSchema = z
@@ -29,8 +30,11 @@ export async function startServer(options = {}) {
         .passthrough();
     const config = loadConfig();
     processService.syncWorkspaceVariablesToProcessEnv();
-    const baseDir = config.baseDir || DEFAULT_BASE_DIR;
-    const openBotDir = resolvePath(baseDir);
+    if (isCloudMode()) {
+        const integrations = getCloudIntegrationsConfig();
+        console.log(`[server] Cloud mode enabled${integrations ? '' : ' (integrations proxy env not set)'}`);
+    }
+    const openBotDir = getBaseDir();
     const PORT = Number(options.port ?? config.port ?? process.env.PORT ?? 4132);
     const app = express();
     const clients = new Map();
@@ -194,6 +198,21 @@ export async function startServer(options = {}) {
         next();
     });
     app.use(cors());
+    const gatewayToken = process.env.OPENBOT_GATEWAY_TOKEN?.trim();
+    if (gatewayToken) {
+        app.use((req, res, next) => {
+            if (req.path === '/api/health' || req.method === 'OPTIONS') {
+                next();
+                return;
+            }
+            const got = req.get('x-openbot-gateway-token');
+            if (got !== gatewayToken) {
+                res.status(401).json({ error: 'unauthorized' });
+                return;
+            }
+            next();
+        });
+    }
     const resolvePublicBaseUrl = () => getPublicBaseUrl(PORT, config.publicUrl);
     app.use((req, res, next) => {
         const isWorkspaceUpload = req.method === 'POST' &&
@@ -206,7 +225,7 @@ export async function startServer(options = {}) {
         express.json({ limit: '20mb' })(req, res, next);
     });
     app.get('/api/health', (req, res) => {
-        res.json({ status: 'ok', version: pkg.version });
+        res.json({ status: 'ok', version: pkg.version, apiVersion: 1 });
     });
     app.get('/api/events', (req, res) => {
         const { channelId, threadId } = getContext(req);
@@ -457,15 +476,21 @@ export async function startServer(options = {}) {
                 });
             }
             const bindIfUnbound = event.type === 'agent:invoke';
-            const resolved = await resolveRespondingAgentId({
+            const target = await resolvePublishTargetAgentId({
+                eventType: event.type,
                 channelId,
                 threadId,
                 requestedAgentId: agentId,
+                eventMeta: event.meta,
                 bindIfUnbound,
             });
+            if ('error' in target) {
+                res.status(400).json({ error: 'agentId is required for widget response' });
+                return;
+            }
             await runAgent({
                 runId,
-                agentId: resolved.agentId,
+                agentId: target.agentId,
                 event,
                 channelId,
                 threadId,
@@ -561,8 +586,21 @@ export async function startServer(options = {}) {
             res.status(500).json({ error: 'Failed to process state request' });
         }
     });
-    app.listen(PORT, () => {
-        console.log(`\x1b[32mOpenBot server listening at http://localhost:${PORT}\x1b[0m`);
+    const HOST = process.env.HOST || '0.0.0.0';
+    const server = app.listen(PORT, HOST, () => {
+        console.log(`\x1b[32mOpenBot server listening at http://${HOST}:${PORT}\x1b[0m`);
         console.log(`🌐 Visit \x1b[96m\x1b[1mhttps://openbot.one\x1b[0m to connect to this runtime and manage everything from there. ✨`);
     });
+    const shutdown = (signal) => {
+        console.log(`\n[server] Received ${signal}, shutting down...`);
+        server.close(() => {
+            process.exit(0);
+        });
+        setTimeout(() => {
+            console.error('[server] Forced shutdown after timeout');
+            process.exit(1);
+        }, 10000).unref();
+    };
+    process.on('SIGTERM', () => shutdown('SIGTERM'));
+    process.on('SIGINT', () => shutdown('SIGINT'));
 }

package/dist/plugins/approval/index.js

@@ -14,7 +14,7 @@ export const approvalPlugin = {
     description: 'Gate protected tool calls behind a UI confirmation widget.',
     factory: ({ config, storage }) => (builder) => {
         // Actions that require approval. Defaults to bash.
-        const actionsToApprove = config.actions || ['action:bash'];
+        const actionsToApprove = config.actions || ['action:shell_exec'];
         for (const action of actionsToApprove) {
             builder.intercept(action, (event, context) => {
                 // If already approved in this flow, let it pass to the actual handler