@geminixiang/mama 0.2.0-beta.4 → 0.2.0-beta.6

package/dist/main.js

@@ -1,34 +1,26 @@
 #!/usr/bin/env node
 import "./instrument.js";
 import { join, resolve } from "path";
-import { mkdirSync, readFileSync, statSync } from "fs";
+import { mkdirSync, readFileSync, statSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { fileURLToPath } from "url";
 import { dirname, join as pathJoin } from "path";
 import { DiscordBot } from "./adapters/discord/index.js";
 import { TelegramBot } from "./adapters/telegram/index.js";
 import { SlackBot as SlackBotClass } from "./adapters/slack/index.js";
-import { createRunner } from "./agent.js";
-import { createManagedSessionFile, createManagedSessionFileAtPath, getChannelSessionDir, getThreadSessionFile, resolveGenericSessionScope, } from "./session-store.js";
 import { downloadChannel } from "./download.js";
 import { createEventsWatcher } from "./events.js";
 import * as log from "./log.js";
 import { FileUserBindingStore } from "./bindings.js";
-import { parseLoginCommand } from "./login/index.js";
 import { startLinkServer } from "./login/portal.js";
 import { InMemoryLinkTokenStore } from "./login/session.js";
-import { parseSessionViewCommand } from "./session-view/command.js";
-import { resolveExistingSessionFile } from "./session-view/service.js";
 import { InMemorySessionViewTokenStore } from "./session-view/store.js";
 import { DockerContainerManager } from "./provisioner.js";
-import { loadAgentConfig } from "./config.js";
+import { createGlobalSettingsFile, loadAgentConfig, MissingGlobalSettingsError } from "./config.js";
 import { SandboxError, parseSandboxArg, validateSandbox } from "./sandbox.js";
 import { FileVaultManager } from "./vault.js";
-import { createManagedVaultEntry, ensureSandboxVaultEntry, resolveActorVaultKey, } from "./vault-routing.js";
-import { addLifecycleBreadcrumb, applyRunScope } from "./sentry.js";
+import { createSessionRuntime } from "./runtime/index.js";
 import { ChannelStore } from "./store.js";
-import { formatNothingRunning, formatStopped, formatStopping } from "./ui-copy.js";
-import { hasMaterializedSlackBranchSession, resolveSlackSessionScope, waitForSlackBranchBootstrap, } from "./adapters/slack/branch-manager.js";
 import * as Sentry from "@sentry/node";
 // ============================================================================
 // Config
@@ -53,14 +45,14 @@ function getVersion() {
     }
     return "unknown";
 }
-const MOM_SLACK_APP_TOKEN = process.env.MOM_SLACK_APP_TOKEN;
-const MOM_SLACK_BOT_TOKEN = process.env.MOM_SLACK_BOT_TOKEN;
-const MOM_TELEGRAM_BOT_TOKEN = process.env.MOM_TELEGRAM_BOT_TOKEN;
-const MOM_DISCORD_BOT_TOKEN = process.env.MOM_DISCORD_BOT_TOKEN;
-const MOM_LINK_URL = process.env.MOM_LINK_URL;
-const MOM_LINK_PORT = process.env.MOM_LINK_PORT
-    ? parseInt(process.env.MOM_LINK_PORT, 10)
-    : MOM_LINK_URL
+const MAMA_SLACK_APP_TOKEN = process.env.MAMA_SLACK_APP_TOKEN;
+const MAMA_SLACK_BOT_TOKEN = process.env.MAMA_SLACK_BOT_TOKEN;
+const MAMA_TELEGRAM_BOT_TOKEN = process.env.MAMA_TELEGRAM_BOT_TOKEN;
+const MAMA_DISCORD_BOT_TOKEN = process.env.MAMA_DISCORD_BOT_TOKEN;
+const MAMA_LINK_URL = process.env.MAMA_LINK_URL;
+const MAMA_LINK_PORT = process.env.MAMA_LINK_PORT
+    ? parseInt(process.env.MAMA_LINK_PORT, 10)
+    : MAMA_LINK_URL
         ? 8181
         : undefined;
 function parseArgs() {
@@ -69,12 +61,16 @@ function parseArgs() {
     let workingDir;
     let stateDirArg;
     let downloadChannelId;
+    let showOnboard = false;
     let showVersion = false;
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
         if (arg === "--version" || arg === "-v" || arg === "-V") {
             showVersion = true;
         }
+        else if (arg === "--onboard") {
+            showOnboard = true;
+        }
         else if (arg.startsWith("--sandbox=")) {
             sandbox = parseSandboxArg(arg.slice("--sandbox=".length));
         }
@@ -102,6 +98,7 @@ function parseArgs() {
         stateDir: stateDirArg ? resolve(stateDirArg) : undefined,
         sandbox,
         downloadChannel: downloadChannelId,
+        showOnboard,
         showVersion,
     };
 }
@@ -144,7 +141,21 @@ function handleStartupError(error) {
         }
         process.exit(1);
     }
-    throw error;
+    if (error instanceof MissingGlobalSettingsError) {
+        console.error(`Missing global settings: ${error.settingsPath}`);
+        console.error("");
+        console.error("Run onboarding to create it:");
+        console.error(`  mama --onboard --state-dir ${stateDir}`);
+        console.error("");
+        console.error("Then review the generated settings.json and start mama again.");
+        process.exit(1);
+    }
+    if (error instanceof Error) {
+        console.error(`Error: ${error.message}`);
+        process.exit(1);
+    }
+    console.error(String(error));
+    process.exit(1);
 }
 let parsedArgs;
 try {
@@ -158,18 +169,35 @@ if (parsedArgs.showVersion) {
     console.log(getVersion());
     process.exit(0);
 }
+// Handle --onboard mode
+if (parsedArgs.showOnboard) {
+    const stateDir = parsedArgs.stateDir ?? join(homedir(), ".mama");
+    process.env.MAMA_STATE_DIR = stateDir;
+    ensureSecureStateDir(stateDir);
+    try {
+        const settingsPath = createGlobalSettingsFile(stateDir);
+        console.log(`Created global settings at ${settingsPath}`);
+        console.log("Review the file, then start mama with your working directory.");
+        process.exit(0);
+    }
+    catch (err) {
+        console.error(err instanceof Error ? err.message : String(err));
+        process.exit(1);
+    }
+}
 // Handle --download mode (Slack only)
 if (parsedArgs.downloadChannel) {
-    if (!MOM_SLACK_BOT_TOKEN) {
-        console.error("Missing env: MOM_SLACK_BOT_TOKEN");
+    if (!MAMA_SLACK_BOT_TOKEN) {
+        console.error("Missing env: MAMA_SLACK_BOT_TOKEN");
         process.exit(1);
     }
-    await downloadChannel(parsedArgs.downloadChannel, MOM_SLACK_BOT_TOKEN);
+    await downloadChannel(parsedArgs.downloadChannel, MAMA_SLACK_BOT_TOKEN);
     process.exit(0);
 }
 // Normal bot mode - require working dir
 if (!parsedArgs.workingDir) {
-    console.error("Usage: mama [--state-dir=<dir>] [--sandbox=host|container:<name>|image:<image>|firecracker:<vm-id>:<host-path>] <working-directory>");
+    console.error("Usage: mama [--state-dir=<dir>] [--sandbox=host|container:<name>|image:<image>|firecracker:<vm-id>:<host-path>|cloudflare:<sandbox-id>] <working-directory>");
+    console.error("       mama --onboard [--state-dir=<dir>]");
     console.error("       mama --download <channel-id>");
     process.exit(1);
 }
@@ -178,14 +206,14 @@ const stateDir = parsedArgs.stateDir ?? join(homedir(), ".mama");
 process.env.MAMA_STATE_DIR = stateDir;
 ensureSecureStateDir(stateDir);
 // Validate platform tokens
-const hasSlack = !!(MOM_SLACK_APP_TOKEN && MOM_SLACK_BOT_TOKEN);
-const hasTelegram = !!MOM_TELEGRAM_BOT_TOKEN;
-const hasDiscord = !!MOM_DISCORD_BOT_TOKEN;
+const hasSlack = !!(MAMA_SLACK_APP_TOKEN && MAMA_SLACK_BOT_TOKEN);
+const hasTelegram = !!MAMA_TELEGRAM_BOT_TOKEN;
+const hasDiscord = !!MAMA_DISCORD_BOT_TOKEN;
 if (!hasSlack && !hasTelegram && !hasDiscord) {
     console.error("No platform tokens found. Set one of:\n" +
-        "  Slack:    MOM_SLACK_APP_TOKEN + MOM_SLACK_BOT_TOKEN\n" +
-        "  Telegram: MOM_TELEGRAM_BOT_TOKEN\n" +
-        "  Discord:  MOM_DISCORD_BOT_TOKEN");
+        "  Slack:    MAMA_SLACK_APP_TOKEN + MAMA_SLACK_BOT_TOKEN\n" +
+        "  Telegram: MAMA_TELEGRAM_BOT_TOKEN\n" +
+        "  Discord:  MAMA_DISCORD_BOT_TOKEN");
     process.exit(1);
 }
 try {
@@ -198,126 +226,54 @@ const vaultManager = new FileVaultManager(stateDir);
 if (vaultManager.isEnabled()) {
     console.log(sandbox.type === "container"
         ? "  Vault system enabled. Container vault active."
-        : sandbox.type === "image" || sandbox.type === "firecracker"
-            ? "  Vault system enabled. Per-user credential routing active."
+        : sandbox.type === "image" || sandbox.type === "firecracker" || sandbox.type === "cloudflare"
+            ? "  Vault system enabled. Conversation-scoped credential routing active."
             : "  Vault system enabled. Host mode will not inject vault env.");
 }
 const bindingStore = new FileUserBindingStore(stateDir);
 if (bindingStore.isEnabled()) {
     console.log(sandbox.type === "container"
         ? "  Binding store enabled. Container mode uses the container vault."
-        : sandbox.type === "image" || sandbox.type === "firecracker"
-            ? "  Binding store enabled. Platform user → vault routing active."
+        : sandbox.type === "image" || sandbox.type === "firecracker" || sandbox.type === "cloudflare"
+            ? "  Binding store enabled, but conversation-scoped sandbox routing does not use it."
             : "  Binding store enabled. Host mode will not inject vault env.");
 }
-const startupConfig = loadAgentConfig(workingDir);
+const startupConfig = (() => {
+    try {
+        return loadAgentConfig();
+    }
+    catch (error) {
+        handleStartupError(error);
+    }
+})();
 const sandboxLimits = startupConfig.sandboxCpus || startupConfig.sandboxMemory
     ? { cpus: startupConfig.sandboxCpus, memory: startupConfig.sandboxMemory }
     : undefined;
 const provisioner = sandbox.type === "image"
-    ? new DockerContainerManager(sandbox.image, workingDir, { limits: sandboxLimits })
+    ? new DockerContainerManager(sandbox.image, { limits: sandboxLimits })
     : undefined;
+if (sandbox.type === "image") {
+    mkdirSync(join(workingDir, "skills"), { recursive: true });
+    mkdirSync(join(workingDir, "events"), { recursive: true });
+    try {
+        writeFileSync(join(workingDir, "MEMORY.md"), "", { flag: "wx" });
+    }
+    catch (err) {
+        if (err.code !== "EEXIST")
+            throw err;
+    }
+}
 const linkTokenStore = new InMemoryLinkTokenStore();
 const sessionViewTokenStore = new InMemorySessionViewTokenStore();
 setInterval(() => linkTokenStore.purge(), 5 * 60 * 1000).unref();
 setInterval(() => sessionViewTokenStore.purge(), 5 * 60 * 1000).unref();
 function portalBaseUrl() {
-    if (MOM_LINK_URL)
-        return MOM_LINK_URL.replace(/\/+$/, "");
-    if (MOM_LINK_PORT)
-        return `http://localhost:${MOM_LINK_PORT}`;
+    if (MAMA_LINK_URL)
+        return MAMA_LINK_URL.replace(/\/+$/, "");
+    if (MAMA_LINK_PORT)
+        return `http://localhost:${MAMA_LINK_PORT}`;
     return undefined;
 }
-function isPrivateConversation(event) {
-    return event.conversationKind === "direct" || event.type === "dm";
-}
-function ensureLoginVault(platform, platformUserId) {
-    const vaultId = resolveActorVaultKey(sandbox, vaultManager, bindingStore, platform, platformUserId);
-    ensureSandboxVaultEntry(sandbox, vaultManager, platform, platformUserId, vaultId);
-    if (sandbox.type !== "container" && sandbox.type !== "image") {
-        vaultManager.addEntry(vaultId, createManagedVaultEntry(platform, platformUserId, vaultId));
-    }
-    return vaultId;
-}
-async function replyWithContext(responseCtx, text) {
-    await responseCtx.setTyping(false);
-    await responseCtx.setWorking(false);
-    await responseCtx.respond(text);
-}
-async function handleLoginCommand(platform, platformUserId, conversationId, responseCtx, commandText, privateConversation) {
-    const parsed = parseLoginCommand(commandText);
-    if (!parsed)
-        return false;
-    if (!privateConversation) {
-        await replyWithContext(responseCtx, "為了保護你的憑證，`/login` 只能在與機器人的私訊中使用。請先私訊機器人，再重新執行 `/login`。");
-        return true;
-    }
-    const baseUrl = portalBaseUrl();
-    if (!baseUrl) {
-        await replyWithContext(responseCtx, "Login is not configured. Set `MOM_LINK_URL` or `MOM_LINK_PORT` on the server.");
-        return true;
-    }
-    let vaultId;
-    try {
-        vaultId = ensureLoginVault(platform, platformUserId);
-    }
-    catch (error) {
-        log.logWarning(`[${conversationId}] Failed to prepare login vault for ${platform}/${platformUserId}`, error instanceof Error ? error.message : String(error));
-        await replyWithContext(responseCtx, "Login setup failed on the server. 請稍後重試，或聯絡管理員檢查 vault 儲存權限。");
-        return true;
-    }
-    const token = linkTokenStore.create(platform, platformUserId, conversationId, vaultId, "");
-    const vaultLabel = sandbox.type === "container" ? `container vault (${vaultId})` : "your vault";
-    await replyWithContext(responseCtx, `Open this link to store credentials in ${vaultLabel} (expires in 15 minutes):\n${baseUrl}/link?token=${token.token}`);
-    return true;
-}
-async function handleSessionViewCommand(platform, platformUserId, conversationId, sessionKey, bot, responseCtx, commandText, privateConversation) {
-    if (!parseSessionViewCommand(commandText))
-        return false;
-    const allowSharedPrivateDelivery = platform === "slack" || platform === "discord";
-    const sendSessionViewReply = async (text) => {
-        if (privateConversation) {
-            await replyWithContext(responseCtx, text);
-            return;
-        }
-        if (platform === "slack" && bot instanceof SlackBotClass) {
-            await bot.postEphemeral(conversationId, platformUserId, text);
-            return;
-        }
-        if (platform === "discord" && bot instanceof DiscordBot) {
-            await bot.sendDirectMessage(platformUserId, text);
-            return;
-        }
-        await replyWithContext(responseCtx, text);
-    };
-    if (!privateConversation && !allowSharedPrivateDelivery) {
-        await sendSessionViewReply("為了保護對話內容，`/session` 目前只能在與機器人的私訊 / DM 中使用。");
-        return true;
-    }
-    const baseUrl = portalBaseUrl();
-    if (!baseUrl) {
-        await sendSessionViewReply("Session viewer is not configured. Set `MOM_LINK_URL` or `MOM_LINK_PORT` on the server.");
-        return true;
-    }
-    const sessionFile = resolveExistingSessionFile(workingDir, conversationId, sessionKey);
-    if (!sessionFile) {
-        await sendSessionViewReply("目前還沒有可查看的 session。先和機器人對話一次，建立 session 後再試。");
-        return true;
-    }
-    const token = sessionViewTokenStore.create(platform, platformUserId, conversationId, sessionKey, sessionFile);
-    const linkText = `Open this read-only session link (expires in 24 hours):\n${baseUrl}/session?token=${token.token}`;
-    await sendSessionViewReply(linkText);
-    return true;
-}
-const conversationStates = new Map();
-/** Track in-flight runs for graceful shutdown */
-const inFlightRuns = new Set();
-/** Flag to stop accepting new events during shutdown */
-let isShuttingDown = false;
-/** Maximum number of cached sessions */
-const MAX_SESSIONS = 500;
-/** Idle timeout before a non-running session can be evicted (1 hour) */
-const IDLE_TIMEOUT_MS = 3600000;
 /** Idle timeout for managed image containers (10 minutes) */
 const IMAGE_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
 if (provisioner) {
@@ -325,245 +281,16 @@ if (provisioner) {
     await provisioner.stopIdle(IMAGE_IDLE_TIMEOUT_MS);
     setInterval(() => provisioner.stopIdle(IMAGE_IDLE_TIMEOUT_MS), IMAGE_IDLE_TIMEOUT_MS).unref();
 }
-async function resolveSessionScope(platformName, conversationDir, sessionKey) {
-    if (platformName === "slack") {
-        return resolveSlackSessionScope({ conversationDir, sessionKey });
-    }
-    return resolveGenericSessionScope({ conversationDir, sessionKey });
-}
-async function getState(conversationId, platformName, sessionKey) {
-    const key = sessionKey ?? conversationId;
-    let state = conversationStates.get(key);
-    if (!state) {
-        const conversationDir = join(workingDir, conversationId);
-        const sessionScope = await resolveSessionScope(platformName, conversationDir, key);
-        state = {
-            running: false,
-            runner: await createRunner(sandbox, key, conversationId, conversationDir, workingDir, sessionScope, vaultManager, bindingStore, provisioner),
-            stopRequested: false,
-            lastAccessedAt: Date.now(),
-        };
-        conversationStates.set(key, state);
-    }
-    else {
-        state.lastAccessedAt = Date.now();
-    }
-    return state;
-}
-/**
- * Evict idle sessions from conversationStates to bound memory usage.
- * Called after each handleEvent completes.
- */
-function evictIdleSessions() {
-    const now = Date.now();
-    for (const [key, state] of conversationStates) {
-        if (!state.running && now - state.lastAccessedAt > IDLE_TIMEOUT_MS) {
-            conversationStates.delete(key);
-        }
-    }
-    if (conversationStates.size > MAX_SESSIONS) {
-        const idleSessions = [];
-        for (const [key, state] of conversationStates) {
-            if (!state.running) {
-                idleSessions.push({ key, lastAccessedAt: state.lastAccessedAt });
-            }
-        }
-        idleSessions.sort((a, b) => a.lastAccessedAt - b.lastAccessedAt);
-        const toEvict = conversationStates.size - MAX_SESSIONS;
-        for (let i = 0; i < toEvict && i < idleSessions.length; i++) {
-            conversationStates.delete(idleSessions[i].key);
-        }
-    }
-}
-// ============================================================================
-// Handler
-// ============================================================================
-const handler = {
-    isRunning(sessionKey) {
-        const state = conversationStates.get(sessionKey);
-        return !!state?.running;
-    },
-    getRunningSessions() {
-        const sessions = [];
-        for (const [sessionKey, state] of conversationStates) {
-            if (state.running && state.startedAt) {
-                // Get current step from runner
-                const currentStep = state.runner.getCurrentStep();
-                sessions.push({
-                    sessionKey,
-                    startedAt: state.startedAt,
-                    lastActivityAt: state.lastActivityAt,
-                    currentTool: currentStep?.label || currentStep?.toolName,
-                });
-            }
-        }
-        return sessions;
-    },
-    async handleStop(sessionKey, conversationId, bot) {
-        const state = conversationStates.get(sessionKey);
-        if (state?.running) {
-            state.stopRequested = true;
-            state.runner.abort();
-            const ts = await bot.postMessage(conversationId, formatStopping(bot));
-            state.stopMessageTs = ts;
-        }
-        else {
-            await bot.postMessage(conversationId, formatNothingRunning(bot));
-        }
-    },
-    forceStop(sessionKey) {
-        const state = conversationStates.get(sessionKey);
-        if (state?.running) {
-            log.logInfo(`[Force Stop] Force stopping session: ${sessionKey}`);
-            state.stopRequested = true;
-            state.runner.abort();
-            state.running = false;
-        }
-    },
-    async handleNew(sessionKey, conversationId, bot) {
-        const state = conversationStates.get(sessionKey);
-        if (state?.running) {
-            state.stopRequested = true;
-            state.runner.abort();
-        }
-        // Conversation sessions rotate via current pointer. Thread sessions reset in place.
-        const conversationDir = join(workingDir, conversationId);
-        if (sessionKey.includes(":")) {
-            createManagedSessionFileAtPath(getThreadSessionFile(conversationDir, sessionKey), conversationDir);
-        }
-        else {
-            createManagedSessionFile(getChannelSessionDir(conversationDir), conversationDir);
-        }
-        // Remove from in-memory cache
-        conversationStates.delete(sessionKey);
-        log.logInfo(`[${conversationId}] Session reset: ${sessionKey}`);
-        await bot.postMessage(conversationId, "Conversation reset. Send a new message to start fresh.");
-    },
-    async handleEvent(event, bot, adapters, _isEvent) {
-        const conversationId = event.conversationId;
-        // Don't accept new events during shutdown
-        if (isShuttingDown) {
-            log.logInfo(`[${conversationId}] Rejected event during shutdown: ${event.text.substring(0, 50)}`);
-            return;
-        }
-        const sessionKey = event.sessionKey ?? `${conversationId}:${event.thread_ts ?? event.ts}`;
-        const privateConversation = isPrivateConversation(event);
-        const handledLogin = await handleLoginCommand(adapters.platform.name, event.user, conversationId, adapters.responseCtx, event.text, privateConversation);
-        if (handledLogin)
-            return;
-        const handledSessionView = await handleSessionViewCommand(adapters.platform.name, event.user, conversationId, sessionKey, bot, adapters.responseCtx, event.text, privateConversation);
-        if (handledSessionView)
-            return;
-        const conversationDir = join(workingDir, conversationId);
-        const waitedForParent = adapters.platform.name === "slack"
-            ? await waitForSlackBranchBootstrap({
-                parentSessionKey: conversationId,
-                sessionKey,
-                hasThreadSession: () => hasMaterializedSlackBranchSession(conversationDir, sessionKey),
-                isParentRunning: () => conversationStates.get(conversationId)?.running === true,
-            })
-            : false;
-        if (waitedForParent) {
-            log.logInfo(`[${conversationId}] Delayed thread bootstrap until parent session sealed: ${sessionKey}`);
-        }
-        const state = await getState(conversationId, adapters.platform.name, sessionKey);
-        // Start run
-        state.running = true;
-        state.stopRequested = false;
-        state.startedAt = Date.now();
-        state.lastActivityAt = Date.now();
-        log.logInfo(`[${conversationId}] Starting run: ${event.text.substring(0, 50)}`);
-        // Wrap in-flight run tracking
-        Sentry.metrics.count("agent.run.started", 1, {
-            attributes: { channel: conversationId },
-        });
-        Sentry.metrics.gauge("agent.sessions.active", inFlightRuns.size + 1);
-        const runPromise = Sentry.startSpan({ name: "agent.run", op: "agent", attributes: { conversationId, sessionKey } }, async () => {
-            return Sentry.withScope(async (scope) => {
-                const { message, responseCtx, platform } = adapters;
-                applyRunScope(scope, {
-                    conversationId,
-                    sessionKey,
-                    messageId: message.id,
-                    platform: platform.name,
-                    userId: message.userId,
-                    userName: message.userName,
-                    threadTs: message.threadTs,
-                    isEvent: _isEvent,
-                });
-                addLifecycleBreadcrumb("agent.run.started", {
-                    channel_id: conversationId,
-                    platform: platform.name,
-                    has_attachments: (message.attachments?.length ?? 0) > 0,
-                });
-                try {
-                    await responseCtx.setTyping(true);
-                    await responseCtx.setWorking(true);
-                    const result = await state.runner.run(message, responseCtx, platform);
-                    await responseCtx.setWorking(false);
-                    const durationMs = Date.now() - state.startedAt;
-                    Sentry.metrics.distribution("agent.run.duration", durationMs, {
-                        unit: "millisecond",
-                        attributes: {
-                            channel: conversationId,
-                            platform: platform.name,
-                            stop_reason: result.stopReason,
-                        },
-                    });
-                    Sentry.metrics.count("agent.run.completed", 1, {
-                        attributes: {
-                            channel: conversationId,
-                            platform: platform.name,
-                            stop_reason: result.stopReason,
-                        },
-                    });
-                    addLifecycleBreadcrumb("agent.run.completed", {
-                        channel_id: conversationId,
-                        platform: platform.name,
-                        stop_reason: result.stopReason,
-                        duration_ms: durationMs,
-                    });
-                    if (result.stopReason === "aborted" && state.stopRequested) {
-                        if (state.stopMessageTs) {
-                            await bot.updateMessage(conversationId, state.stopMessageTs, formatStopped(bot));
-                            state.stopMessageTs = undefined;
-                        }
-                        else {
-                            await bot.postMessage(conversationId, formatStopped(bot));
-                        }
-                    }
-                }
-                catch (err) {
-                    scope.setContext("agent_run_error", {
-                        conversationId,
-                        sessionKey,
-                        platform: adapters.platform.name,
-                        messageId: adapters.message.id,
-                        threadTs: adapters.message.threadTs,
-                    });
-                    Sentry.captureException(err);
-                    Sentry.metrics.count("agent.run.errors", 1, {
-                        attributes: { channel: conversationId, platform: adapters.platform.name },
-                    });
-                    log.logWarning(`[${conversationId}] Run error`, err instanceof Error ? err.message : String(err));
-                }
-                finally {
-                    state.running = false;
-                    state.lastAccessedAt = Date.now();
-                    Sentry.metrics.gauge("agent.sessions.active", inFlightRuns.size - 1);
-                    evictIdleSessions();
-                }
-            });
-        });
-        inFlightRuns.add(runPromise);
-        try {
-            await runPromise;
-        }
-        finally {
-            inFlightRuns.delete(runPromise);
-        }
-    },
-};
+const handler = createSessionRuntime({
+    workingDir,
+    sandbox,
+    vaultManager,
+    bindingStore,
+    provisioner,
+    linkTokenStore,
+    sessionViewTokenStore,
+    portalBaseUrl: portalBaseUrl(),
+});
 // ============================================================================
 // Start
 // ============================================================================
@@ -573,16 +300,18 @@ const sandboxDesc = sandbox.type === "host"
         ? `container:${sandbox.container}`
         : sandbox.type === "image"
             ? `image:${sandbox.image}`
-            : `firecracker:${sandbox.vmId}`;
+            : sandbox.type === "firecracker"
+                ? `firecracker:${sandbox.vmId}`
+                : `cloudflare:${sandbox.sandboxId}`;
 log.logStartup(workingDir, sandboxDesc);
 // Create platform bots
 const bots = [];
 const botsByPlatform = {};
 if (hasSlack) {
-    const sharedStore = new ChannelStore({ workingDir, botToken: MOM_SLACK_BOT_TOKEN });
+    const sharedStore = new ChannelStore({ workingDir, botToken: MAMA_SLACK_BOT_TOKEN });
     const slackBot = new SlackBotClass(handler, {
-        appToken: MOM_SLACK_APP_TOKEN,
-        botToken: MOM_SLACK_BOT_TOKEN,
+        appToken: MAMA_SLACK_APP_TOKEN,
+        botToken: MAMA_SLACK_BOT_TOKEN,
         workingDir,
         store: sharedStore,
     });
@@ -592,7 +321,7 @@ if (hasSlack) {
 }
 if (hasTelegram) {
     const telegramBot = new TelegramBot(handler, {
-        token: MOM_TELEGRAM_BOT_TOKEN,
+        token: MAMA_TELEGRAM_BOT_TOKEN,
         workingDir,
     });
     bots.push(telegramBot);
@@ -601,15 +330,15 @@ if (hasTelegram) {
 }
 if (hasDiscord) {
     const discordBot = new DiscordBot(handler, {
-        token: MOM_DISCORD_BOT_TOKEN,
+        token: MAMA_DISCORD_BOT_TOKEN,
         workingDir,
     });
     bots.push(discordBot);
     botsByPlatform.discord = discordBot;
     log.logInfo("Platform: Discord");
 }
-if (MOM_LINK_PORT) {
-    startLinkServer(MOM_LINK_PORT, linkTokenStore, vaultManager, async (platform, conversationId, message) => {
+if (MAMA_LINK_PORT) {
+    startLinkServer(MAMA_LINK_PORT, linkTokenStore, vaultManager, async (platform, conversationId, message) => {
         const bot = botsByPlatform[platform];
         if (bot)
             await bot.postMessage(conversationId, message);
@@ -624,17 +353,7 @@ if (slackBot) {
 eventsWatcher.start();
 // Handle shutdown
 async function shutdown() {
-    if (isShuttingDown)
-        return;
-    isShuttingDown = true;
-    log.logInfo("Shutting down gracefully...");
-    const timeout = Date.now() + 30000;
-    while (inFlightRuns.size > 0 && Date.now() < timeout) {
-        await new Promise((resolve) => setTimeout(resolve, 500));
-    }
-    if (inFlightRuns.size > 0) {
-        log.logWarning(`Forcing exit with ${inFlightRuns.size} runs still in progress`);
-    }
+    await handler.shutdown();
     eventsWatcher.stop();
     await Sentry.close(5000);
     process.exit(0);