@geminixiang/mama 0.2.0-beta.7 → 0.2.0-beta.9

package/dist/runtime/conversation-orchestrator.d.ts

@@ -0,0 +1,42 @@
+import type { Bot, BotAdapters, BotEvent } from "../adapter.js";
+import type { AgentRunner } from "../agent.js";
+import type { CommandRegistry } from "../commands/index.js";
+import type { CommandServices } from "../commands/index.js";
+export interface ConversationRuntimeState {
+    running: boolean;
+    runner: AgentRunner;
+    stopRequested: boolean;
+    stopMessageTs?: string;
+    lastAccessedAt: number;
+    startedAt?: number;
+    lastActivityAt?: number;
+}
+export interface RunConversationOptions {
+    event: BotEvent;
+    bot: Bot;
+    adapters: BotAdapters;
+    isSyntheticEvent?: boolean;
+}
+interface ConversationOrchestratorOptions {
+    workingDir: string;
+    commandRegistry: CommandRegistry;
+    commandServices: CommandServices;
+    isShuttingDown: () => boolean;
+    getState: (sessionKey: string) => ConversationRuntimeState | undefined;
+    getOrCreateState: (options: {
+        conversationId: string;
+        platformName: string;
+        sessionKey: string;
+    }) => Promise<ConversationRuntimeState>;
+    beforeRunTracked: (runPromise: Promise<void>) => void;
+    afterRunTracked: (runPromise: Promise<void>) => void;
+    onRunFinished: () => void;
+}
+export declare class ConversationOrchestrator {
+    private readonly options;
+    constructor(options: ConversationOrchestratorOptions);
+    runSession({ event, bot, adapters, isSyntheticEvent }: RunConversationOptions): Promise<void>;
+    private runWithInstrumentation;
+}
+export {};
+//# sourceMappingURL=conversation-orchestrator.d.ts.map

package/dist/runtime/conversation-orchestrator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-orchestrator.d.ts","sourceRoot":"","sources":["../../src/runtime/conversation-orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAgB,MAAM,eAAe,CAAC;AAK9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQ5D,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,QAAQ,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,UAAU,+BAA+B;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,MAAM,OAAO,CAAC;IAC9B,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,wBAAwB,GAAG,SAAS,CAAC;IACvE,gBAAgB,EAAE,CAAC,OAAO,EAAE;QAC1B,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,KAAK,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACxC,gBAAgB,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IACtD,eAAe,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IACrD,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED,qBAAa,wBAAwB;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAApC,YAA6B,OAAO,EAAE,+BAA+B,EAAI;IAEnE,UAAU,CAAC,EACf,KAAK,EACL,GAAG,EACH,QAAQ,EACR,gBAAgB,EACjB,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FxC;YAEa,sBAAsB;CA8ErC","sourcesContent":["import type { Bot, BotAdapters, BotEvent, PlatformName } from \"../adapter.js\";\nimport {\n  hasMaterializedSlackBranchSession,\n  waitForSlackBranchBootstrap,\n} from \"../adapters/slack/branch-manager.js\";\nimport type { AgentRunner } from \"../agent.js\";\nimport type { CommandRegistry } from \"../commands/index.js\";\nimport type { CommandServices } from \"../commands/index.js\";\nimport { isPrivateConversation } from \"../commands/utils.js\";\nimport * as log from \"../log.js\";\nimport { addLifecycleBreadcrumb, applyRunScope } from \"../sentry.js\";\nimport { formatStopped } from \"../ui-copy.js\";\nimport * as Sentry from \"@sentry/node\";\nimport { join } from \"path\";\n\nexport interface ConversationRuntimeState {\n  running: boolean;\n  runner: AgentRunner;\n  stopRequested: boolean;\n  stopMessageTs?: string;\n  lastAccessedAt: number;\n  startedAt?: number;\n  lastActivityAt?: number;\n}\n\nexport interface RunConversationOptions {\n  event: BotEvent;\n  bot: Bot;\n  adapters: BotAdapters;\n  isSyntheticEvent?: boolean;\n}\n\ninterface ConversationOrchestratorOptions {\n  workingDir: string;\n  commandRegistry: CommandRegistry;\n  commandServices: CommandServices;\n  isShuttingDown: () => boolean;\n  getState: (sessionKey: string) => ConversationRuntimeState | undefined;\n  getOrCreateState: (options: {\n    conversationId: string;\n    platformName: string;\n    sessionKey: string;\n  }) => Promise<ConversationRuntimeState>;\n  beforeRunTracked: (runPromise: Promise<void>) => void;\n  afterRunTracked: (runPromise: Promise<void>) => void;\n  onRunFinished: () => void;\n}\n\nexport class ConversationOrchestrator {\n  constructor(private readonly options: ConversationOrchestratorOptions) {}\n\n  async runSession({\n    event,\n    bot,\n    adapters,\n    isSyntheticEvent,\n  }: RunConversationOptions): Promise<void> {\n    const conversationId = event.conversationId;\n    if (this.options.isShuttingDown()) {\n      log.logInfo(\n        `[${conversationId}] Rejected event during shutdown: ${event.text.substring(0, 50)}`,\n      );\n      return;\n    }\n\n    const sessionKey = event.sessionKey ?? `${conversationId}:${event.thread_ts ?? event.ts}`;\n    const privateConversation = isPrivateConversation(event);\n    const handledCommand = await this.options.commandRegistry.handle({\n      bot,\n      responseCtx: adapters.responseCtx,\n      platform: adapters.platform.name as PlatformName,\n      platformUserId: event.user,\n      conversationId,\n      vaultConversationId: event.vaultConversationId,\n      sessionKey,\n      commandText: event.text,\n      privateConversation,\n      services: this.options.commandServices,\n    });\n    if (handledCommand) return;\n\n    const conversationDir = join(this.options.workingDir, conversationId);\n    const waitedForParent =\n      adapters.platform.name === \"slack\"\n        ? await waitForSlackBranchBootstrap({\n            parentSessionKey: conversationId,\n            sessionKey,\n            hasThreadSession: () => hasMaterializedSlackBranchSession(conversationDir, sessionKey),\n            isParentRunning: () => this.options.getState(conversationId)?.running === true,\n          })\n        : false;\n    if (waitedForParent) {\n      log.logInfo(\n        `[${conversationId}] Delayed thread bootstrap until parent session sealed: ${sessionKey}`,\n      );\n    }\n\n    const state = await this.options.getOrCreateState({\n      conversationId,\n      platformName: adapters.platform.name,\n      sessionKey,\n    });\n\n    state.running = true;\n    state.stopRequested = false;\n    state.startedAt = Date.now();\n    state.lastActivityAt = Date.now();\n\n    log.logInfo(`[${conversationId}] Starting run: ${event.text.substring(0, 50)}`);\n\n    const runPromise = (async () => {\n      try {\n        const result = await this.runWithInstrumentation(\n          adapters,\n          { conversationId, sessionKey, isSyntheticEvent, startedAt: state.startedAt! },\n          async () => {\n            await adapters.responseCtx.setTyping(true);\n            await adapters.responseCtx.setWorking(true);\n            const runnerResult = await state.runner.run(\n              adapters.message,\n              adapters.responseCtx,\n              adapters.platform,\n            );\n            await adapters.responseCtx.setWorking(false);\n            return runnerResult;\n          },\n        );\n\n        if (result?.stopReason === \"aborted\" && state.stopRequested) {\n          if (state.stopMessageTs) {\n            await bot.updateMessage(conversationId, state.stopMessageTs, formatStopped(bot));\n            state.stopMessageTs = undefined;\n          } else {\n            await bot.postMessage(conversationId, formatStopped(bot));\n          }\n        }\n      } finally {\n        state.running = false;\n        state.lastAccessedAt = Date.now();\n        this.options.onRunFinished();\n      }\n    })();\n\n    this.options.beforeRunTracked(runPromise);\n    try {\n      await runPromise;\n    } finally {\n      this.options.afterRunTracked(runPromise);\n    }\n  }\n\n  private async runWithInstrumentation(\n    adapters: BotAdapters,\n    meta: {\n      conversationId: string;\n      sessionKey: string;\n      isSyntheticEvent?: boolean;\n      startedAt: number;\n    },\n    body: () => Promise<{ stopReason: string; errorMessage?: string }>,\n  ): Promise<{ stopReason: string; errorMessage?: string } | undefined> {\n    const { conversationId, sessionKey, isSyntheticEvent, startedAt } = meta;\n    const { message, platform } = adapters;\n\n    Sentry.metrics.count(\"agent.run.started\", 1, {\n      attributes: { channel: conversationId },\n    });\n\n    return Sentry.startSpan(\n      { name: \"agent.run\", op: \"agent\", attributes: { conversationId, sessionKey } },\n      async () =>\n        Sentry.withScope(async (scope) => {\n          applyRunScope(scope, {\n            conversationId,\n            sessionKey,\n            messageId: message.id,\n            platform: platform.name,\n            userId: message.userId,\n            userName: message.userName,\n            threadTs: message.threadTs,\n            isSyntheticEvent,\n          });\n          addLifecycleBreadcrumb(\"agent.run.started\", {\n            channel_id: conversationId,\n            platform: platform.name,\n            has_attachments: (message.attachments?.length ?? 0) > 0,\n          });\n\n          try {\n            const result = await body();\n            const durationMs = Date.now() - startedAt;\n            const completionAttrs = {\n              channel: conversationId,\n              platform: platform.name,\n              stop_reason: result.stopReason,\n            };\n            Sentry.metrics.distribution(\"agent.run.duration\", durationMs, {\n              unit: \"millisecond\",\n              attributes: completionAttrs,\n            });\n            Sentry.metrics.count(\"agent.run.completed\", 1, { attributes: completionAttrs });\n            addLifecycleBreadcrumb(\"agent.run.completed\", {\n              channel_id: conversationId,\n              platform: platform.name,\n              stop_reason: result.stopReason,\n              duration_ms: durationMs,\n            });\n            return result;\n          } catch (err) {\n            scope.setContext(\"agent_run_error\", {\n              conversationId,\n              sessionKey,\n              platform: platform.name,\n              messageId: message.id,\n              threadTs: message.threadTs,\n            });\n            Sentry.captureException(err);\n            Sentry.metrics.count(\"agent.run.errors\", 1, {\n              attributes: { channel: conversationId, platform: platform.name },\n            });\n            log.logWarning(\n              `[${conversationId}] Run error`,\n              err instanceof Error ? err.message : String(err),\n            );\n            return undefined;\n          }\n        }),\n    );\n  }\n}\n"]}

package/dist/runtime/conversation-orchestrator.js

@@ -0,0 +1,150 @@
+import { hasMaterializedSlackBranchSession, waitForSlackBranchBootstrap, } from "../adapters/slack/branch-manager.js";
+import { isPrivateConversation } from "../commands/utils.js";
+import * as log from "../log.js";
+import { addLifecycleBreadcrumb, applyRunScope } from "../sentry.js";
+import { formatStopped } from "../ui-copy.js";
+import * as Sentry from "@sentry/node";
+import { join } from "path";
+export class ConversationOrchestrator {
+    constructor(options) {
+        this.options = options;
+    }
+    async runSession({ event, bot, adapters, isSyntheticEvent, }) {
+        const conversationId = event.conversationId;
+        if (this.options.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 handledCommand = await this.options.commandRegistry.handle({
+            bot,
+            responseCtx: adapters.responseCtx,
+            platform: adapters.platform.name,
+            platformUserId: event.user,
+            conversationId,
+            vaultConversationId: event.vaultConversationId,
+            sessionKey,
+            commandText: event.text,
+            privateConversation,
+            services: this.options.commandServices,
+        });
+        if (handledCommand)
+            return;
+        const conversationDir = join(this.options.workingDir, conversationId);
+        const waitedForParent = adapters.platform.name === "slack"
+            ? await waitForSlackBranchBootstrap({
+                parentSessionKey: conversationId,
+                sessionKey,
+                hasThreadSession: () => hasMaterializedSlackBranchSession(conversationDir, sessionKey),
+                isParentRunning: () => this.options.getState(conversationId)?.running === true,
+            })
+            : false;
+        if (waitedForParent) {
+            log.logInfo(`[${conversationId}] Delayed thread bootstrap until parent session sealed: ${sessionKey}`);
+        }
+        const state = await this.options.getOrCreateState({
+            conversationId,
+            platformName: adapters.platform.name,
+            sessionKey,
+        });
+        state.running = true;
+        state.stopRequested = false;
+        state.startedAt = Date.now();
+        state.lastActivityAt = Date.now();
+        log.logInfo(`[${conversationId}] Starting run: ${event.text.substring(0, 50)}`);
+        const runPromise = (async () => {
+            try {
+                const result = await this.runWithInstrumentation(adapters, { conversationId, sessionKey, isSyntheticEvent, startedAt: state.startedAt }, async () => {
+                    await adapters.responseCtx.setTyping(true);
+                    await adapters.responseCtx.setWorking(true);
+                    const runnerResult = await state.runner.run(adapters.message, adapters.responseCtx, adapters.platform);
+                    await adapters.responseCtx.setWorking(false);
+                    return runnerResult;
+                });
+                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));
+                    }
+                }
+            }
+            finally {
+                state.running = false;
+                state.lastAccessedAt = Date.now();
+                this.options.onRunFinished();
+            }
+        })();
+        this.options.beforeRunTracked(runPromise);
+        try {
+            await runPromise;
+        }
+        finally {
+            this.options.afterRunTracked(runPromise);
+        }
+    }
+    async runWithInstrumentation(adapters, meta, body) {
+        const { conversationId, sessionKey, isSyntheticEvent, startedAt } = meta;
+        const { message, platform } = adapters;
+        Sentry.metrics.count("agent.run.started", 1, {
+            attributes: { channel: conversationId },
+        });
+        return Sentry.startSpan({ name: "agent.run", op: "agent", attributes: { conversationId, sessionKey } }, async () => Sentry.withScope(async (scope) => {
+            applyRunScope(scope, {
+                conversationId,
+                sessionKey,
+                messageId: message.id,
+                platform: platform.name,
+                userId: message.userId,
+                userName: message.userName,
+                threadTs: message.threadTs,
+                isSyntheticEvent,
+            });
+            addLifecycleBreadcrumb("agent.run.started", {
+                channel_id: conversationId,
+                platform: platform.name,
+                has_attachments: (message.attachments?.length ?? 0) > 0,
+            });
+            try {
+                const result = await body();
+                const durationMs = Date.now() - startedAt;
+                const completionAttrs = {
+                    channel: conversationId,
+                    platform: platform.name,
+                    stop_reason: result.stopReason,
+                };
+                Sentry.metrics.distribution("agent.run.duration", durationMs, {
+                    unit: "millisecond",
+                    attributes: completionAttrs,
+                });
+                Sentry.metrics.count("agent.run.completed", 1, { attributes: completionAttrs });
+                addLifecycleBreadcrumb("agent.run.completed", {
+                    channel_id: conversationId,
+                    platform: platform.name,
+                    stop_reason: result.stopReason,
+                    duration_ms: durationMs,
+                });
+                return result;
+            }
+            catch (err) {
+                scope.setContext("agent_run_error", {
+                    conversationId,
+                    sessionKey,
+                    platform: platform.name,
+                    messageId: message.id,
+                    threadTs: message.threadTs,
+                });
+                Sentry.captureException(err);
+                Sentry.metrics.count("agent.run.errors", 1, {
+                    attributes: { channel: conversationId, platform: platform.name },
+                });
+                log.logWarning(`[${conversationId}] Run error`, err instanceof Error ? err.message : String(err));
+                return undefined;
+            }
+        }));
+    }
+}
+//# sourceMappingURL=conversation-orchestrator.js.map

package/dist/runtime/conversation-orchestrator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-orchestrator.js","sourceRoot":"","sources":["../../src/runtime/conversation-orchestrator.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bot, BotAdapters, BotEvent, PlatformName } from \"../adapter.js\";\nimport {\n  hasMaterializedSlackBranchSession,\n  waitForSlackBranchBootstrap,\n} from \"../adapters/slack/branch-manager.js\";\nimport type { AgentRunner } from \"../agent.js\";\nimport type { CommandRegistry } from \"../commands/index.js\";\nimport type { CommandServices } from \"../commands/index.js\";\nimport { isPrivateConversation } from \"../commands/utils.js\";\nimport * as log from \"../log.js\";\nimport { addLifecycleBreadcrumb, applyRunScope } from \"../sentry.js\";\nimport { formatStopped } from \"../ui-copy.js\";\nimport * as Sentry from \"@sentry/node\";\nimport { join } from \"path\";\n\nexport interface ConversationRuntimeState {\n  running: boolean;\n  runner: AgentRunner;\n  stopRequested: boolean;\n  stopMessageTs?: string;\n  lastAccessedAt: number;\n  startedAt?: number;\n  lastActivityAt?: number;\n}\n\nexport interface RunConversationOptions {\n  event: BotEvent;\n  bot: Bot;\n  adapters: BotAdapters;\n  isSyntheticEvent?: boolean;\n}\n\ninterface ConversationOrchestratorOptions {\n  workingDir: string;\n  commandRegistry: CommandRegistry;\n  commandServices: CommandServices;\n  isShuttingDown: () => boolean;\n  getState: (sessionKey: string) => ConversationRuntimeState | undefined;\n  getOrCreateState: (options: {\n    conversationId: string;\n    platformName: string;\n    sessionKey: string;\n  }) => Promise<ConversationRuntimeState>;\n  beforeRunTracked: (runPromise: Promise<void>) => void;\n  afterRunTracked: (runPromise: Promise<void>) => void;\n  onRunFinished: () => void;\n}\n\nexport class ConversationOrchestrator {\n  constructor(private readonly options: ConversationOrchestratorOptions) {}\n\n  async runSession({\n    event,\n    bot,\n    adapters,\n    isSyntheticEvent,\n  }: RunConversationOptions): Promise<void> {\n    const conversationId = event.conversationId;\n    if (this.options.isShuttingDown()) {\n      log.logInfo(\n        `[${conversationId}] Rejected event during shutdown: ${event.text.substring(0, 50)}`,\n      );\n      return;\n    }\n\n    const sessionKey = event.sessionKey ?? `${conversationId}:${event.thread_ts ?? event.ts}`;\n    const privateConversation = isPrivateConversation(event);\n    const handledCommand = await this.options.commandRegistry.handle({\n      bot,\n      responseCtx: adapters.responseCtx,\n      platform: adapters.platform.name as PlatformName,\n      platformUserId: event.user,\n      conversationId,\n      vaultConversationId: event.vaultConversationId,\n      sessionKey,\n      commandText: event.text,\n      privateConversation,\n      services: this.options.commandServices,\n    });\n    if (handledCommand) return;\n\n    const conversationDir = join(this.options.workingDir, conversationId);\n    const waitedForParent =\n      adapters.platform.name === \"slack\"\n        ? await waitForSlackBranchBootstrap({\n            parentSessionKey: conversationId,\n            sessionKey,\n            hasThreadSession: () => hasMaterializedSlackBranchSession(conversationDir, sessionKey),\n            isParentRunning: () => this.options.getState(conversationId)?.running === true,\n          })\n        : false;\n    if (waitedForParent) {\n      log.logInfo(\n        `[${conversationId}] Delayed thread bootstrap until parent session sealed: ${sessionKey}`,\n      );\n    }\n\n    const state = await this.options.getOrCreateState({\n      conversationId,\n      platformName: adapters.platform.name,\n      sessionKey,\n    });\n\n    state.running = true;\n    state.stopRequested = false;\n    state.startedAt = Date.now();\n    state.lastActivityAt = Date.now();\n\n    log.logInfo(`[${conversationId}] Starting run: ${event.text.substring(0, 50)}`);\n\n    const runPromise = (async () => {\n      try {\n        const result = await this.runWithInstrumentation(\n          adapters,\n          { conversationId, sessionKey, isSyntheticEvent, startedAt: state.startedAt! },\n          async () => {\n            await adapters.responseCtx.setTyping(true);\n            await adapters.responseCtx.setWorking(true);\n            const runnerResult = await state.runner.run(\n              adapters.message,\n              adapters.responseCtx,\n              adapters.platform,\n            );\n            await adapters.responseCtx.setWorking(false);\n            return runnerResult;\n          },\n        );\n\n        if (result?.stopReason === \"aborted\" && state.stopRequested) {\n          if (state.stopMessageTs) {\n            await bot.updateMessage(conversationId, state.stopMessageTs, formatStopped(bot));\n            state.stopMessageTs = undefined;\n          } else {\n            await bot.postMessage(conversationId, formatStopped(bot));\n          }\n        }\n      } finally {\n        state.running = false;\n        state.lastAccessedAt = Date.now();\n        this.options.onRunFinished();\n      }\n    })();\n\n    this.options.beforeRunTracked(runPromise);\n    try {\n      await runPromise;\n    } finally {\n      this.options.afterRunTracked(runPromise);\n    }\n  }\n\n  private async runWithInstrumentation(\n    adapters: BotAdapters,\n    meta: {\n      conversationId: string;\n      sessionKey: string;\n      isSyntheticEvent?: boolean;\n      startedAt: number;\n    },\n    body: () => Promise<{ stopReason: string; errorMessage?: string }>,\n  ): Promise<{ stopReason: string; errorMessage?: string } | undefined> {\n    const { conversationId, sessionKey, isSyntheticEvent, startedAt } = meta;\n    const { message, platform } = adapters;\n\n    Sentry.metrics.count(\"agent.run.started\", 1, {\n      attributes: { channel: conversationId },\n    });\n\n    return Sentry.startSpan(\n      { name: \"agent.run\", op: \"agent\", attributes: { conversationId, sessionKey } },\n      async () =>\n        Sentry.withScope(async (scope) => {\n          applyRunScope(scope, {\n            conversationId,\n            sessionKey,\n            messageId: message.id,\n            platform: platform.name,\n            userId: message.userId,\n            userName: message.userName,\n            threadTs: message.threadTs,\n            isSyntheticEvent,\n          });\n          addLifecycleBreadcrumb(\"agent.run.started\", {\n            channel_id: conversationId,\n            platform: platform.name,\n            has_attachments: (message.attachments?.length ?? 0) > 0,\n          });\n\n          try {\n            const result = await body();\n            const durationMs = Date.now() - startedAt;\n            const completionAttrs = {\n              channel: conversationId,\n              platform: platform.name,\n              stop_reason: result.stopReason,\n            };\n            Sentry.metrics.distribution(\"agent.run.duration\", durationMs, {\n              unit: \"millisecond\",\n              attributes: completionAttrs,\n            });\n            Sentry.metrics.count(\"agent.run.completed\", 1, { attributes: completionAttrs });\n            addLifecycleBreadcrumb(\"agent.run.completed\", {\n              channel_id: conversationId,\n              platform: platform.name,\n              stop_reason: result.stopReason,\n              duration_ms: durationMs,\n            });\n            return result;\n          } catch (err) {\n            scope.setContext(\"agent_run_error\", {\n              conversationId,\n              sessionKey,\n              platform: platform.name,\n              messageId: message.id,\n              threadTs: message.threadTs,\n            });\n            Sentry.captureException(err);\n            Sentry.metrics.count(\"agent.run.errors\", 1, {\n              attributes: { channel: conversationId, platform: platform.name },\n            });\n            log.logWarning(\n              `[${conversationId}] Run error`,\n              err instanceof Error ? err.message : String(err),\n            );\n            return undefined;\n          }\n        }),\n    );\n  }\n}\n"]}

package/dist/runtime/session-runtime.d.ts

@@ -6,7 +6,7 @@ export interface RunSessionOptions {
     event: BotEvent;
     bot: Bot;
     adapters: BotAdapters;
-    isEvent?: boolean;
+    isSyntheticEvent?: boolean;
 }
 export interface CreateSessionSandboxOptions {
     conversationId: string;

package/dist/runtime/session-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/session-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,WAAW,EACX,QAAQ,EACR,UAAU,EAGX,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAC;AACrF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AA0B5D,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,QAAQ,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,2BAA2B;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,2EAA2E;IAC3E,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACjF,uBAAuB,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1F,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAKD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,cAAc,CAEnF","sourcesContent":["import type {\n  Bot,\n  BotAdapters,\n  BotEvent,\n  BotHandler,\n  PlatformName,\n  RunningSession,\n} from \"../adapter.js\";\nimport {\n  hasMaterializedSlackBranchSession,\n  resolveSlackSessionScope,\n  waitForSlackBranchBootstrap,\n} from \"../adapters/slack/branch-manager.js\";\nimport { type AgentRunner, createRunner } from \"../agent.js\";\nimport { CommandRegistry, createDefaultCommandRegistry } from \"../commands/index.js\";\nimport type { CommandServices } from \"../commands/index.js\";\nimport { isPrivateConversation } from \"../commands/utils.js\";\nimport * as log from \"../log.js\";\nimport {\n  createManagedSessionFile,\n  createManagedSessionFileAtPath,\n  getChannelSessionDir,\n  getThreadSessionFile,\n  resolveGenericSessionScope,\n  type ResolvedSessionScope,\n} from \"../session-store.js\";\nimport { addLifecycleBreadcrumb, applyRunScope } from \"../sentry.js\";\nimport { formatNothingRunning, formatStopped, formatStopping } from \"../ui-copy.js\";\nimport * as Sentry from \"@sentry/node\";\nimport { join } from \"path\";\n\ninterface ConversationState {\n  running: boolean;\n  runner: AgentRunner;\n  stopRequested: boolean;\n  stopMessageTs?: string;\n  lastAccessedAt: number;\n  startedAt?: number;\n  lastActivityAt?: number;\n}\n\nexport interface RunSessionOptions {\n  event: BotEvent;\n  bot: Bot;\n  adapters: BotAdapters;\n  isEvent?: boolean;\n}\n\nexport interface CreateSessionSandboxOptions {\n  conversationId: string;\n  platformName: string;\n  sessionKey: string;\n}\n\nexport interface SessionRuntimeOptions extends CommandServices {\n  /** Override the default command registry (e.g., to add /help, /status). */\n  commandRegistry?: CommandRegistry;\n}\n\nexport interface SessionRuntime extends BotHandler {\n  runSession(options: RunSessionOptions): Promise<void>;\n  createSessionSandbox(options: CreateSessionSandboxOptions): Promise<AgentRunner>;\n  switchConversationModel(conversationId: string, provider: string, model: string): boolean;\n  shutdown(timeoutMs?: number): Promise<void>;\n}\n\nconst MAX_SESSIONS = 500;\nconst IDLE_TIMEOUT_MS = 3_600_000;\n\nexport function createSessionRuntime(options: SessionRuntimeOptions): SessionRuntime {\n  return new MamaSessionRuntime(options);\n}\n\nclass MamaSessionRuntime implements SessionRuntime {\n  private readonly conversationStates = new Map<string, ConversationState>();\n  private readonly inFlightRuns = new Set<Promise<void>>();\n  private readonly commandRegistry: CommandRegistry;\n  private isShuttingDown = false;\n\n  constructor(private readonly options: SessionRuntimeOptions) {\n    this.options.runtime = this;\n    this.commandRegistry = options.commandRegistry ?? createDefaultCommandRegistry();\n  }\n\n  isRunning(sessionKey: string): boolean {\n    const state = this.conversationStates.get(sessionKey);\n    return !!state?.running;\n  }\n\n  getRunningSessions(): RunningSession[] {\n    const sessions: RunningSession[] = [];\n    for (const [sessionKey, state] of this.conversationStates) {\n      if (state.running && state.startedAt) {\n        const currentStep = state.runner.getCurrentStep();\n        sessions.push({\n          sessionKey,\n          startedAt: state.startedAt,\n          lastActivityAt: state.lastActivityAt,\n          currentTool: currentStep?.label || currentStep?.toolName,\n        });\n      }\n    }\n    return sessions;\n  }\n\n  async handleStop(sessionKey: string, conversationId: string, bot: Bot): Promise<void> {\n    const state = this.conversationStates.get(sessionKey);\n    if (state?.running) {\n      state.stopRequested = true;\n      state.runner.abort();\n      const ts = await bot.postMessage(conversationId, formatStopping(bot));\n      state.stopMessageTs = ts;\n    } else {\n      await bot.postMessage(conversationId, formatNothingRunning(bot));\n    }\n  }\n\n  forceStop(sessionKey: string): void {\n    const state = this.conversationStates.get(sessionKey);\n    if (state?.running) {\n      log.logInfo(`[Force Stop] Force stopping session: ${sessionKey}`);\n      state.stopRequested = true;\n      state.runner.abort();\n      state.running = false;\n    }\n  }\n\n  async handleNew(sessionKey: string, conversationId: string, bot: Bot): Promise<void> {\n    const state = this.conversationStates.get(sessionKey);\n    if (state?.running) {\n      state.stopRequested = true;\n      state.runner.abort();\n    }\n\n    const conversationDir = join(this.options.workingDir, conversationId);\n    if (sessionKey.includes(\":\")) {\n      createManagedSessionFileAtPath(\n        getThreadSessionFile(conversationDir, sessionKey),\n        conversationDir,\n      );\n    } else {\n      createManagedSessionFile(getChannelSessionDir(conversationDir), conversationDir);\n    }\n\n    this.conversationStates.delete(sessionKey);\n\n    log.logInfo(`[${conversationId}] Session reset: ${sessionKey}`);\n    await bot.postMessage(conversationId, \"Conversation reset. Send a new message to start fresh.\");\n  }\n\n  async handleEvent(\n    event: BotEvent,\n    bot: Bot,\n    adapters: BotAdapters,\n    isEvent?: boolean,\n  ): Promise<void> {\n    await this.runSession({ event, bot, adapters, isEvent });\n  }\n\n  async runSession({ event, bot, adapters, isEvent }: RunSessionOptions): Promise<void> {\n    const conversationId = event.conversationId;\n    if (this.isShuttingDown) {\n      log.logInfo(\n        `[${conversationId}] Rejected event during shutdown: ${event.text.substring(0, 50)}`,\n      );\n      return;\n    }\n\n    const sessionKey = event.sessionKey ?? `${conversationId}:${event.thread_ts ?? event.ts}`;\n    const privateConversation = isPrivateConversation(event);\n    const handledCommand = await this.commandRegistry.handle({\n      bot,\n      responseCtx: adapters.responseCtx,\n      platform: adapters.platform.name as PlatformName,\n      platformUserId: event.user,\n      conversationId,\n      vaultConversationId: event.vaultConversationId,\n      sessionKey,\n      commandText: event.text,\n      privateConversation,\n      services: this.options,\n    });\n    if (handledCommand) return;\n\n    const conversationDir = join(this.options.workingDir, conversationId);\n    const waitedForParent =\n      adapters.platform.name === \"slack\"\n        ? await waitForSlackBranchBootstrap({\n            parentSessionKey: conversationId,\n            sessionKey,\n            hasThreadSession: () => hasMaterializedSlackBranchSession(conversationDir, sessionKey),\n            isParentRunning: () => this.conversationStates.get(conversationId)?.running === true,\n          })\n        : false;\n    if (waitedForParent) {\n      log.logInfo(\n        `[${conversationId}] Delayed thread bootstrap until parent session sealed: ${sessionKey}`,\n      );\n    }\n\n    const state = await this.getOrCreateState({\n      conversationId,\n      platformName: adapters.platform.name,\n      sessionKey,\n    });\n\n    state.running = true;\n    state.stopRequested = false;\n    state.startedAt = Date.now();\n    state.lastActivityAt = Date.now();\n\n    log.logInfo(`[${conversationId}] Starting run: ${event.text.substring(0, 50)}`);\n\n    const runPromise = (async () => {\n      try {\n        const result = await this.runWithInstrumentation(\n          adapters,\n          { conversationId, sessionKey, isEvent, startedAt: state.startedAt! },\n          async () => {\n            await adapters.responseCtx.setTyping(true);\n            await adapters.responseCtx.setWorking(true);\n            const r = await state.runner.run(\n              adapters.message,\n              adapters.responseCtx,\n              adapters.platform,\n            );\n            await adapters.responseCtx.setWorking(false);\n            return r;\n          },\n        );\n\n        if (result?.stopReason === \"aborted\" && state.stopRequested) {\n          if (state.stopMessageTs) {\n            await bot.updateMessage(conversationId, state.stopMessageTs, formatStopped(bot));\n            state.stopMessageTs = undefined;\n          } else {\n            await bot.postMessage(conversationId, formatStopped(bot));\n          }\n        }\n      } finally {\n        state.running = false;\n        state.lastAccessedAt = Date.now();\n        Sentry.metrics.gauge(\"agent.sessions.active\", this.inFlightRuns.size - 1);\n        this.evictIdleSessions();\n      }\n    })();\n\n    this.inFlightRuns.add(runPromise);\n    try {\n      await runPromise;\n    } finally {\n      this.inFlightRuns.delete(runPromise);\n    }\n  }\n\n  private async runWithInstrumentation(\n    adapters: BotAdapters,\n    meta: { conversationId: string; sessionKey: string; isEvent?: boolean; startedAt: number },\n    body: () => Promise<{ stopReason: string; errorMessage?: string }>,\n  ): Promise<{ stopReason: string; errorMessage?: string } | undefined> {\n    const { conversationId, sessionKey, isEvent, startedAt } = meta;\n    const { message, platform } = adapters;\n\n    Sentry.metrics.count(\"agent.run.started\", 1, {\n      attributes: { channel: conversationId },\n    });\n    Sentry.metrics.gauge(\"agent.sessions.active\", this.inFlightRuns.size + 1);\n\n    return Sentry.startSpan(\n      { name: \"agent.run\", op: \"agent\", attributes: { conversationId, sessionKey } },\n      async () =>\n        Sentry.withScope(async (scope) => {\n          applyRunScope(scope, {\n            conversationId,\n            sessionKey,\n            messageId: message.id,\n            platform: platform.name,\n            userId: message.userId,\n            userName: message.userName,\n            threadTs: message.threadTs,\n            isEvent,\n          });\n          addLifecycleBreadcrumb(\"agent.run.started\", {\n            channel_id: conversationId,\n            platform: platform.name,\n            has_attachments: (message.attachments?.length ?? 0) > 0,\n          });\n\n          try {\n            const result = await body();\n            const durationMs = Date.now() - startedAt;\n            const completionAttrs = {\n              channel: conversationId,\n              platform: platform.name,\n              stop_reason: result.stopReason,\n            };\n            Sentry.metrics.distribution(\"agent.run.duration\", durationMs, {\n              unit: \"millisecond\",\n              attributes: completionAttrs,\n            });\n            Sentry.metrics.count(\"agent.run.completed\", 1, { attributes: completionAttrs });\n            addLifecycleBreadcrumb(\"agent.run.completed\", {\n              channel_id: conversationId,\n              platform: platform.name,\n              stop_reason: result.stopReason,\n              duration_ms: durationMs,\n            });\n            return result;\n          } catch (err) {\n            scope.setContext(\"agent_run_error\", {\n              conversationId,\n              sessionKey,\n              platform: platform.name,\n              messageId: message.id,\n              threadTs: message.threadTs,\n            });\n            Sentry.captureException(err);\n            Sentry.metrics.count(\"agent.run.errors\", 1, {\n              attributes: { channel: conversationId, platform: platform.name },\n            });\n            log.logWarning(\n              `[${conversationId}] Run error`,\n              err instanceof Error ? err.message : String(err),\n            );\n            return undefined;\n          }\n        }),\n    );\n  }\n\n  async createSessionSandbox(options: CreateSessionSandboxOptions): Promise<AgentRunner> {\n    const state = await this.getOrCreateState(options);\n    return state.runner;\n  }\n\n  switchConversationModel(conversationId: string, _provider: string, _model: string): boolean {\n    for (const [sessionKey, state] of this.conversationStates) {\n      if (this.isConversationSession(sessionKey, conversationId) && state.running) {\n        return false;\n      }\n    }\n\n    for (const sessionKey of Array.from(this.conversationStates.keys())) {\n      if (this.isConversationSession(sessionKey, conversationId)) {\n        this.conversationStates.delete(sessionKey);\n      }\n    }\n    log.logInfo(`[${conversationId}] Model switched; cleared cached session runners`);\n    return true;\n  }\n\n  private isConversationSession(sessionKey: string, conversationId: string): boolean {\n    return sessionKey === conversationId || sessionKey.startsWith(`${conversationId}:`);\n  }\n\n  private async getOrCreateState({\n    conversationId,\n    platformName,\n    sessionKey,\n  }: CreateSessionSandboxOptions): Promise<ConversationState> {\n    const existing = this.conversationStates.get(sessionKey);\n    if (existing) {\n      existing.lastAccessedAt = Date.now();\n      return existing;\n    }\n\n    const conversationDir = join(this.options.workingDir, conversationId);\n    const sessionScope = await this.resolveSessionScope(platformName, conversationDir, sessionKey);\n    const state: ConversationState = {\n      running: false,\n      runner: await createRunner(\n        this.options.sandbox,\n        sessionKey,\n        conversationId,\n        conversationDir,\n        this.options.workingDir,\n        sessionScope,\n        this.options.vaultManager,\n        this.options.bindingStore,\n        this.options.provisioner,\n      ),\n      stopRequested: false,\n      lastAccessedAt: Date.now(),\n    };\n    this.conversationStates.set(sessionKey, state);\n    return state;\n  }\n\n  async shutdown(timeoutMs = 30_000): Promise<void> {\n    if (this.isShuttingDown) return;\n    this.isShuttingDown = true;\n    log.logInfo(\"Shutting down gracefully...\");\n\n    const timeout = Date.now() + timeoutMs;\n    while (this.inFlightRuns.size > 0 && Date.now() < timeout) {\n      await new Promise((resolve) => setTimeout(resolve, 500));\n    }\n\n    if (this.inFlightRuns.size > 0) {\n      log.logWarning(`Forcing exit with ${this.inFlightRuns.size} runs still in progress`);\n    }\n  }\n\n  private async resolveSessionScope(\n    platformName: string,\n    conversationDir: string,\n    sessionKey: string,\n  ): Promise<ResolvedSessionScope> {\n    if (platformName === \"slack\") {\n      return resolveSlackSessionScope({ conversationDir, sessionKey });\n    }\n    return resolveGenericSessionScope({ conversationDir, sessionKey });\n  }\n\n  private evictIdleSessions(): void {\n    const now = Date.now();\n\n    for (const [key, state] of this.conversationStates) {\n      if (!state.running && now - state.lastAccessedAt > IDLE_TIMEOUT_MS) {\n        this.conversationStates.delete(key);\n      }\n    }\n\n    if (this.conversationStates.size > MAX_SESSIONS) {\n      const idleSessions: Array<{ key: string; lastAccessedAt: number }> = [];\n      for (const [key, state] of this.conversationStates) {\n        if (!state.running) {\n          idleSessions.push({ key, lastAccessedAt: state.lastAccessedAt });\n        }\n      }\n\n      idleSessions.sort((a, b) => a.lastAccessedAt - b.lastAccessedAt);\n\n      const toEvict = this.conversationStates.size - MAX_SESSIONS;\n      for (let i = 0; i < toEvict && i < idleSessions.length; i++) {\n        this.conversationStates.delete(idleSessions[i].key);\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"session-runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/session-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAkB,MAAM,eAAe,CAAC;AAE5F,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAgC,MAAM,sBAAsB,CAAC;AACrF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAoB5D,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,QAAQ,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,WAAW,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,2BAA2B;IAC1C,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,2EAA2E;IAC3E,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACjF,uBAAuB,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1F,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAYD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,cAAc,CAEnF","sourcesContent":["import type { Bot, BotAdapters, BotEvent, BotHandler, RunningSession } from \"../adapter.js\";\nimport { resolveSlackSessionScope } from \"../adapters/slack/branch-manager.js\";\nimport { type AgentRunner, createRunner } from \"../agent.js\";\nimport { CommandRegistry, createDefaultCommandRegistry } from \"../commands/index.js\";\nimport type { CommandServices } from \"../commands/index.js\";\nimport * as log from \"../log.js\";\nimport {\n  createManagedSessionFile,\n  createManagedSessionFileAtPath,\n  getChannelSessionDir,\n  getThreadSessionFile,\n  resolveGenericSessionScope,\n  type ResolvedSessionScope,\n} from \"../session-store.js\";\nimport { formatNothingRunning, formatStopping } from \"../ui-copy.js\";\nimport {\n  ConversationOrchestrator,\n  type ConversationRuntimeState,\n} from \"./conversation-orchestrator.js\";\nimport * as Sentry from \"@sentry/node\";\nimport { join } from \"path\";\n\ntype ConversationState = ConversationRuntimeState;\n\nexport interface RunSessionOptions {\n  event: BotEvent;\n  bot: Bot;\n  adapters: BotAdapters;\n  isSyntheticEvent?: boolean;\n}\n\nexport interface CreateSessionSandboxOptions {\n  conversationId: string;\n  platformName: string;\n  sessionKey: string;\n}\n\nexport interface SessionRuntimeOptions extends CommandServices {\n  /** Override the default command registry (e.g., to add /help, /status). */\n  commandRegistry?: CommandRegistry;\n}\n\nexport interface SessionRuntime extends BotHandler {\n  runSession(options: RunSessionOptions): Promise<void>;\n  createSessionSandbox(options: CreateSessionSandboxOptions): Promise<AgentRunner>;\n  switchConversationModel(conversationId: string, provider: string, model: string): boolean;\n  shutdown(timeoutMs?: number): Promise<void>;\n}\n\nconst MAX_SESSIONS = 500;\nconst IDLE_TIMEOUT_MS = 3_600_000;\n\nfunction runtimeCwdForSandbox(\n  type: SessionRuntimeOptions[\"sandbox\"][\"type\"],\n  hostCwd: string,\n): string {\n  return type === \"host\" ? hostCwd : \"/workspace\";\n}\n\nexport function createSessionRuntime(options: SessionRuntimeOptions): SessionRuntime {\n  return new MamaSessionRuntime(options);\n}\n\nclass MamaSessionRuntime implements SessionRuntime {\n  private readonly conversationStates = new Map<string, ConversationState>();\n  private readonly sessionQueues = new Map<string, Promise<void>>();\n  private readonly inFlightRuns = new Set<Promise<void>>();\n  private readonly commandRegistry: CommandRegistry;\n  private readonly orchestrator: ConversationOrchestrator;\n  private isShuttingDown = false;\n\n  constructor(private readonly options: SessionRuntimeOptions) {\n    this.options.runtime = this;\n    this.commandRegistry = options.commandRegistry ?? createDefaultCommandRegistry();\n    this.orchestrator = new ConversationOrchestrator({\n      workingDir: options.workingDir,\n      commandRegistry: this.commandRegistry,\n      commandServices: this.options,\n      isShuttingDown: () => this.isShuttingDown,\n      getState: (sessionKey) => this.conversationStates.get(sessionKey),\n      getOrCreateState: (createOptions) => this.getOrCreateState(createOptions),\n      beforeRunTracked: (runPromise) => {\n        this.inFlightRuns.add(runPromise);\n        Sentry.metrics.gauge(\"agent.sessions.active\", this.inFlightRuns.size);\n      },\n      afterRunTracked: (runPromise) => {\n        this.inFlightRuns.delete(runPromise);\n      },\n      onRunFinished: () => {\n        Sentry.metrics.gauge(\"agent.sessions.active\", this.inFlightRuns.size - 1);\n        this.evictIdleSessions();\n      },\n    });\n  }\n\n  isRunning(sessionKey: string): boolean {\n    const state = this.conversationStates.get(sessionKey);\n    return !!state?.running;\n  }\n\n  getRunningSessions(): RunningSession[] {\n    const sessions: RunningSession[] = [];\n    for (const [sessionKey, state] of this.conversationStates) {\n      if (state.running && state.startedAt) {\n        const currentStep = state.runner.getCurrentStep();\n        sessions.push({\n          sessionKey,\n          startedAt: state.startedAt,\n          lastActivityAt: state.lastActivityAt,\n          currentTool: currentStep?.label || currentStep?.toolName,\n        });\n      }\n    }\n    return sessions;\n  }\n\n  async handleStop(sessionKey: string, conversationId: string, bot: Bot): Promise<void> {\n    const state = this.conversationStates.get(sessionKey);\n    if (state?.running) {\n      state.stopRequested = true;\n      state.runner.abort();\n      const ts = await bot.postMessage(conversationId, formatStopping(bot));\n      state.stopMessageTs = ts;\n    } else {\n      await bot.postMessage(conversationId, formatNothingRunning(bot));\n    }\n  }\n\n  forceStop(sessionKey: string): void {\n    const state = this.conversationStates.get(sessionKey);\n    if (state?.running) {\n      log.logInfo(`[Force Stop] Force stopping session: ${sessionKey}`);\n      state.stopRequested = true;\n      state.runner.abort();\n      state.running = false;\n    }\n  }\n\n  async handleNewCommand(sessionKey: string, conversationId: string, bot: Bot): Promise<void> {\n    const state = this.conversationStates.get(sessionKey);\n    if (state?.running) {\n      state.stopRequested = true;\n      state.runner.abort();\n    }\n\n    const conversationDir = join(this.options.workingDir, conversationId);\n    const runtimeCwd = runtimeCwdForSandbox(this.options.sandbox.type, conversationDir);\n    if (sessionKey.includes(\":\")) {\n      createManagedSessionFileAtPath(getThreadSessionFile(conversationDir, sessionKey), runtimeCwd);\n    } else {\n      createManagedSessionFile(getChannelSessionDir(conversationDir), runtimeCwd);\n    }\n\n    this.conversationStates.delete(sessionKey);\n\n    log.logInfo(`[${conversationId}] Session reset: ${sessionKey}`);\n    await bot.postMessage(conversationId, \"Conversation reset. Send a new message to start fresh.\");\n  }\n\n  async handleEvent(\n    event: BotEvent,\n    bot: Bot,\n    adapters: BotAdapters,\n    isSyntheticEvent?: boolean,\n  ): Promise<void> {\n    const sessionKey = event.sessionKey ?? `${event.conversationId}:${event.thread_ts ?? event.ts}`;\n    const previous = this.sessionQueues.get(sessionKey) ?? Promise.resolve();\n    const next = previous\n      .catch(() => {})\n      .then(() => this.runSession({ event, bot, adapters, isSyntheticEvent }));\n    this.sessionQueues.set(sessionKey, next);\n    try {\n      await next;\n    } finally {\n      if (this.sessionQueues.get(sessionKey) === next) {\n        this.sessionQueues.delete(sessionKey);\n      }\n    }\n  }\n\n  async runSession({ event, bot, adapters, isSyntheticEvent }: RunSessionOptions): Promise<void> {\n    await this.orchestrator.runSession({ event, bot, adapters, isSyntheticEvent });\n  }\n\n  async createSessionSandbox(options: CreateSessionSandboxOptions): Promise<AgentRunner> {\n    const state = await this.getOrCreateState(options);\n    return state.runner;\n  }\n\n  switchConversationModel(conversationId: string, _provider: string, _model: string): boolean {\n    for (const [sessionKey, state] of this.conversationStates) {\n      if (this.isConversationSession(sessionKey, conversationId) && state.running) {\n        return false;\n      }\n    }\n\n    for (const sessionKey of Array.from(this.conversationStates.keys())) {\n      if (this.isConversationSession(sessionKey, conversationId)) {\n        this.conversationStates.delete(sessionKey);\n      }\n    }\n    log.logInfo(`[${conversationId}] Model switched; cleared cached session runners`);\n    return true;\n  }\n\n  private isConversationSession(sessionKey: string, conversationId: string): boolean {\n    return sessionKey === conversationId || sessionKey.startsWith(`${conversationId}:`);\n  }\n\n  private async getOrCreateState({\n    conversationId,\n    platformName,\n    sessionKey,\n  }: CreateSessionSandboxOptions): Promise<ConversationState> {\n    const existing = this.conversationStates.get(sessionKey);\n    if (existing) {\n      existing.lastAccessedAt = Date.now();\n      return existing;\n    }\n\n    const conversationDir = join(this.options.workingDir, conversationId);\n    const runtimeCwd = runtimeCwdForSandbox(this.options.sandbox.type, conversationDir);\n    const sessionScope = await this.resolveSessionScope(\n      platformName,\n      conversationDir,\n      sessionKey,\n      runtimeCwd,\n    );\n    const state: ConversationState = {\n      running: false,\n      runner: await createRunner(\n        this.options.sandbox,\n        sessionKey,\n        conversationId,\n        conversationDir,\n        this.options.workingDir,\n        sessionScope,\n        this.options.vaultManager,\n        this.options.provisioner,\n      ),\n      stopRequested: false,\n      lastAccessedAt: Date.now(),\n    };\n    this.conversationStates.set(sessionKey, state);\n    return state;\n  }\n\n  async shutdown(timeoutMs = 30_000): Promise<void> {\n    if (this.isShuttingDown) return;\n    this.isShuttingDown = true;\n    log.logInfo(\"Shutting down gracefully...\");\n\n    const timeout = Date.now() + timeoutMs;\n    while (this.inFlightRuns.size > 0 && Date.now() < timeout) {\n      await new Promise((resolve) => setTimeout(resolve, 500));\n    }\n\n    if (this.inFlightRuns.size > 0) {\n      log.logWarning(`Forcing exit with ${this.inFlightRuns.size} runs still in progress`);\n    }\n  }\n\n  private async resolveSessionScope(\n    platformName: string,\n    conversationDir: string,\n    sessionKey: string,\n    cwd: string,\n  ): Promise<ResolvedSessionScope> {\n    if (platformName === \"slack\") {\n      return resolveSlackSessionScope({ conversationDir, sessionKey, cwd });\n    }\n    return resolveGenericSessionScope({ conversationDir, sessionKey, cwd });\n  }\n\n  private evictIdleSessions(): void {\n    const now = Date.now();\n\n    for (const [key, state] of this.conversationStates) {\n      if (!state.running && now - state.lastAccessedAt > IDLE_TIMEOUT_MS) {\n        this.conversationStates.delete(key);\n      }\n    }\n\n    if (this.conversationStates.size > MAX_SESSIONS) {\n      const idleSessions: Array<{ key: string; lastAccessedAt: number }> = [];\n      for (const [key, state] of this.conversationStates) {\n        if (!state.running) {\n          idleSessions.push({ key, lastAccessedAt: state.lastAccessedAt });\n        }\n      }\n\n      idleSessions.sort((a, b) => a.lastAccessedAt - b.lastAccessedAt);\n\n      const toEvict = this.conversationStates.size - MAX_SESSIONS;\n      for (let i = 0; i < toEvict && i < idleSessions.length; i++) {\n        this.conversationStates.delete(idleSessions[i].key);\n      }\n    }\n  }\n}\n"]}

package/dist/runtime/session-runtime.js

@@ -1,15 +1,17 @@
-import { hasMaterializedSlackBranchSession, resolveSlackSessionScope, waitForSlackBranchBootstrap, } from "../adapters/slack/branch-manager.js";
+import { resolveSlackSessionScope } from "../adapters/slack/branch-manager.js";
 import { createRunner } from "../agent.js";
 import { createDefaultCommandRegistry } from "../commands/index.js";
-import { isPrivateConversation } from "../commands/utils.js";
 import * as log from "../log.js";
 import { createManagedSessionFile, createManagedSessionFileAtPath, getChannelSessionDir, getThreadSessionFile, resolveGenericSessionScope, } from "../session-store.js";
-import { addLifecycleBreadcrumb, applyRunScope } from "../sentry.js";
-import { formatNothingRunning, formatStopped, formatStopping } from "../ui-copy.js";
+import { formatNothingRunning, formatStopping } from "../ui-copy.js";
+import { ConversationOrchestrator, } from "./conversation-orchestrator.js";
 import * as Sentry from "@sentry/node";
 import { join } from "path";
 const MAX_SESSIONS = 500;
 const IDLE_TIMEOUT_MS = 3_600_000;
+function runtimeCwdForSandbox(type, hostCwd) {
+    return type === "host" ? hostCwd : "/workspace";
+}
 export function createSessionRuntime(options) {
     return new MamaSessionRuntime(options);
 }
@@ -17,10 +19,30 @@ class MamaSessionRuntime {
     constructor(options) {
         this.options = options;
         this.conversationStates = new Map();
+        this.sessionQueues = new Map();
         this.inFlightRuns = new Set();
         this.isShuttingDown = false;
         this.options.runtime = this;
         this.commandRegistry = options.commandRegistry ?? createDefaultCommandRegistry();
+        this.orchestrator = new ConversationOrchestrator({
+            workingDir: options.workingDir,
+            commandRegistry: this.commandRegistry,
+            commandServices: this.options,
+            isShuttingDown: () => this.isShuttingDown,
+            getState: (sessionKey) => this.conversationStates.get(sessionKey),
+            getOrCreateState: (createOptions) => this.getOrCreateState(createOptions),
+            beforeRunTracked: (runPromise) => {
+                this.inFlightRuns.add(runPromise);
+                Sentry.metrics.gauge("agent.sessions.active", this.inFlightRuns.size);
+            },
+            afterRunTracked: (runPromise) => {
+                this.inFlightRuns.delete(runPromise);
+            },
+            onRunFinished: () => {
+                Sentry.metrics.gauge("agent.sessions.active", this.inFlightRuns.size - 1);
+                this.evictIdleSessions();
+            },
+        });
     }
     isRunning(sessionKey) {
         const state = this.conversationStates.get(sessionKey);
@@ -62,164 +84,42 @@ class MamaSessionRuntime {
             state.running = false;
         }
     }
-    async handleNew(sessionKey, conversationId, bot) {
+    async handleNewCommand(sessionKey, conversationId, bot) {
         const state = this.conversationStates.get(sessionKey);
         if (state?.running) {
             state.stopRequested = true;
             state.runner.abort();
         }
         const conversationDir = join(this.options.workingDir, conversationId);
+        const runtimeCwd = runtimeCwdForSandbox(this.options.sandbox.type, conversationDir);
         if (sessionKey.includes(":")) {
-            createManagedSessionFileAtPath(getThreadSessionFile(conversationDir, sessionKey), conversationDir);
+            createManagedSessionFileAtPath(getThreadSessionFile(conversationDir, sessionKey), runtimeCwd);
         }
         else {
-            createManagedSessionFile(getChannelSessionDir(conversationDir), conversationDir);
+            createManagedSessionFile(getChannelSessionDir(conversationDir), runtimeCwd);
         }
         this.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) {
-        await this.runSession({ event, bot, adapters, isEvent });
-    }
-    async runSession({ event, bot, adapters, isEvent }) {
-        const conversationId = event.conversationId;
-        if (this.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 handledCommand = await this.commandRegistry.handle({
-            bot,
-            responseCtx: adapters.responseCtx,
-            platform: adapters.platform.name,
-            platformUserId: event.user,
-            conversationId,
-            vaultConversationId: event.vaultConversationId,
-            sessionKey,
-            commandText: event.text,
-            privateConversation,
-            services: this.options,
-        });
-        if (handledCommand)
-            return;
-        const conversationDir = join(this.options.workingDir, conversationId);
-        const waitedForParent = adapters.platform.name === "slack"
-            ? await waitForSlackBranchBootstrap({
-                parentSessionKey: conversationId,
-                sessionKey,
-                hasThreadSession: () => hasMaterializedSlackBranchSession(conversationDir, sessionKey),
-                isParentRunning: () => this.conversationStates.get(conversationId)?.running === true,
-            })
-            : false;
-        if (waitedForParent) {
-            log.logInfo(`[${conversationId}] Delayed thread bootstrap until parent session sealed: ${sessionKey}`);
-        }
-        const state = await this.getOrCreateState({
-            conversationId,
-            platformName: adapters.platform.name,
-            sessionKey,
-        });
-        state.running = true;
-        state.stopRequested = false;
-        state.startedAt = Date.now();
-        state.lastActivityAt = Date.now();
-        log.logInfo(`[${conversationId}] Starting run: ${event.text.substring(0, 50)}`);
-        const runPromise = (async () => {
-            try {
-                const result = await this.runWithInstrumentation(adapters, { conversationId, sessionKey, isEvent, startedAt: state.startedAt }, async () => {
-                    await adapters.responseCtx.setTyping(true);
-                    await adapters.responseCtx.setWorking(true);
-                    const r = await state.runner.run(adapters.message, adapters.responseCtx, adapters.platform);
-                    await adapters.responseCtx.setWorking(false);
-                    return r;
-                });
-                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));
-                    }
-                }
-            }
-            finally {
-                state.running = false;
-                state.lastAccessedAt = Date.now();
-                Sentry.metrics.gauge("agent.sessions.active", this.inFlightRuns.size - 1);
-                this.evictIdleSessions();
-            }
-        })();
-        this.inFlightRuns.add(runPromise);
+    async handleEvent(event, bot, adapters, isSyntheticEvent) {
+        const sessionKey = event.sessionKey ?? `${event.conversationId}:${event.thread_ts ?? event.ts}`;
+        const previous = this.sessionQueues.get(sessionKey) ?? Promise.resolve();
+        const next = previous
+            .catch(() => { })
+            .then(() => this.runSession({ event, bot, adapters, isSyntheticEvent }));
+        this.sessionQueues.set(sessionKey, next);
         try {
-            await runPromise;
+            await next;
         }
         finally {
-            this.inFlightRuns.delete(runPromise);
+            if (this.sessionQueues.get(sessionKey) === next) {
+                this.sessionQueues.delete(sessionKey);
+            }
         }
     }
-    async runWithInstrumentation(adapters, meta, body) {
-        const { conversationId, sessionKey, isEvent, startedAt } = meta;
-        const { message, platform } = adapters;
-        Sentry.metrics.count("agent.run.started", 1, {
-            attributes: { channel: conversationId },
-        });
-        Sentry.metrics.gauge("agent.sessions.active", this.inFlightRuns.size + 1);
-        return Sentry.startSpan({ name: "agent.run", op: "agent", attributes: { conversationId, sessionKey } }, async () => Sentry.withScope(async (scope) => {
-            applyRunScope(scope, {
-                conversationId,
-                sessionKey,
-                messageId: message.id,
-                platform: platform.name,
-                userId: message.userId,
-                userName: message.userName,
-                threadTs: message.threadTs,
-                isEvent,
-            });
-            addLifecycleBreadcrumb("agent.run.started", {
-                channel_id: conversationId,
-                platform: platform.name,
-                has_attachments: (message.attachments?.length ?? 0) > 0,
-            });
-            try {
-                const result = await body();
-                const durationMs = Date.now() - startedAt;
-                const completionAttrs = {
-                    channel: conversationId,
-                    platform: platform.name,
-                    stop_reason: result.stopReason,
-                };
-                Sentry.metrics.distribution("agent.run.duration", durationMs, {
-                    unit: "millisecond",
-                    attributes: completionAttrs,
-                });
-                Sentry.metrics.count("agent.run.completed", 1, { attributes: completionAttrs });
-                addLifecycleBreadcrumb("agent.run.completed", {
-                    channel_id: conversationId,
-                    platform: platform.name,
-                    stop_reason: result.stopReason,
-                    duration_ms: durationMs,
-                });
-                return result;
-            }
-            catch (err) {
-                scope.setContext("agent_run_error", {
-                    conversationId,
-                    sessionKey,
-                    platform: platform.name,
-                    messageId: message.id,
-                    threadTs: message.threadTs,
-                });
-                Sentry.captureException(err);
-                Sentry.metrics.count("agent.run.errors", 1, {
-                    attributes: { channel: conversationId, platform: platform.name },
-                });
-                log.logWarning(`[${conversationId}] Run error`, err instanceof Error ? err.message : String(err));
-                return undefined;
-            }
-        }));
+    async runSession({ event, bot, adapters, isSyntheticEvent }) {
+        await this.orchestrator.runSession({ event, bot, adapters, isSyntheticEvent });
     }
     async createSessionSandbox(options) {
         const state = await this.getOrCreateState(options);
@@ -249,10 +149,11 @@ class MamaSessionRuntime {
             return existing;
         }
         const conversationDir = join(this.options.workingDir, conversationId);
-        const sessionScope = await this.resolveSessionScope(platformName, conversationDir, sessionKey);
+        const runtimeCwd = runtimeCwdForSandbox(this.options.sandbox.type, conversationDir);
+        const sessionScope = await this.resolveSessionScope(platformName, conversationDir, sessionKey, runtimeCwd);
         const state = {
             running: false,
-            runner: await createRunner(this.options.sandbox, sessionKey, conversationId, conversationDir, this.options.workingDir, sessionScope, this.options.vaultManager, this.options.bindingStore, this.options.provisioner),
+            runner: await createRunner(this.options.sandbox, sessionKey, conversationId, conversationDir, this.options.workingDir, sessionScope, this.options.vaultManager, this.options.provisioner),
             stopRequested: false,
             lastAccessedAt: Date.now(),
         };
@@ -272,11 +173,11 @@ class MamaSessionRuntime {
             log.logWarning(`Forcing exit with ${this.inFlightRuns.size} runs still in progress`);
         }
     }
-    async resolveSessionScope(platformName, conversationDir, sessionKey) {
+    async resolveSessionScope(platformName, conversationDir, sessionKey, cwd) {
         if (platformName === "slack") {
-            return resolveSlackSessionScope({ conversationDir, sessionKey });
+            return resolveSlackSessionScope({ conversationDir, sessionKey, cwd });
         }
-        return resolveGenericSessionScope({ conversationDir, sessionKey });
+        return resolveGenericSessionScope({ conversationDir, sessionKey, cwd });
     }
     evictIdleSessions() {
         const now = Date.now();