@geminixiang/mama 0.2.0-beta.1 → 0.2.0-beta.3

package/dist/agent.js

@@ -11,7 +11,7 @@ import { ActorExecutionResolver } from "./execution-resolver.js";
 import * as log from "./log.js";
 import { createExecutor } from "./sandbox.js";
 import { addLifecycleBreadcrumb, metricAttributes } from "./sentry.js";
-import { createManagedSessionFileAtPath, extractSessionSuffix, extractSessionUuid, forkThreadSessionFile, getChannelSessionDir, getThreadSessionFile, openManagedSession, resolveChannelSessionFile, resolveManagedSessionFile, tryResolveThreadSession, } from "./session-store.js";
+import { extractSessionSuffix, extractSessionUuid, openManagedSession, } from "./session-store.js";
 import { createMamaTools } from "./tools/index.js";
 import * as Sentry from "@sentry/node";
 const IMAGE_MIME_TYPES = {
@@ -24,6 +24,13 @@ const IMAGE_MIME_TYPES = {
 function getImageMimeType(filename) {
     return IMAGE_MIME_TYPES[filename.toLowerCase().split(".").pop() || ""];
 }
+function buildThreadSessionName(message) {
+    const text = message?.text?.trim();
+    if (!text)
+        return undefined;
+    const userLabel = message?.userName || message?.user || "unknown";
+    return `[${userLabel}]: ${text}`;
+}
 async function getMemory(conversationDir) {
     const parts = [];
     // Read workspace-level memory (shared across all conversations)
@@ -87,11 +94,12 @@ function loadMamaSkills(conversationDir, workspacePath) {
     }
     return Array.from(skillMap.values());
 }
-function buildSystemPrompt(workspacePath, conversationId, currentUserId, memory, sandboxConfig, platform, skills) {
+function buildSystemPrompt(workspacePath, conversationId, conversationKind, currentUserId, memory, sandboxConfig, platform, skills) {
     const conversationPath = `${workspacePath}/${conversationId}`;
     const isContainer = sandboxConfig.type === "container" || sandboxConfig.type === "image";
+    const isImageSandbox = sandboxConfig.type === "image";
     const isFirecracker = sandboxConfig.type === "firecracker";
-    // Format platform conversation mappings
+    // Format channel mappings
     const channelMappings = platform.channels.length > 0
         ? platform.channels.map((c) => `${c.id}\t#${c.name}`).join("\n")
         : "(no channels loaded)";
@@ -99,17 +107,22 @@ function buildSystemPrompt(workspacePath, conversationId, currentUserId, memory,
     const userMappings = platform.users.length > 0
         ? platform.users.map((u) => `${u.id}\t@${u.userName}\t${u.displayName}`).join("\n")
         : "(no users loaded)";
-    const envDescription = isContainer
-        ? `You are running inside a container (Docker runtime, Alpine Linux).
+    const envDescription = isImageSandbox
+        ? `You are running inside a managed per-user container.
+- Bash working directory: / (use cd or absolute paths)
+- Install tools with the image's package manager
+- Your changes persist for this user's container until it is recreated`
+        : isContainer
+            ? `You are running inside a shared container.
 - Bash working directory: / (use cd or absolute paths)
-- Install tools with: apk add <package>
+- Install tools with the container's package manager
 - Your changes persist across sessions`
-        : isFirecracker
-            ? `You are running inside a Firecracker microVM.
+            : isFirecracker
+                ? `You are running inside a Firecracker microVM.
 - Bash working directory: / (use cd or absolute paths)
 - Install tools with: apt-get install <package> (Debian-based)
 - Your changes persist across sessions`
-            : `You are running directly on the host machine.
+                : `You are running directly on the host machine.
 - Bash working directory: ${process.cwd()}
 - Be careful with system modifications`;
     return `You are mama, a ${platform.name} bot assistant. Be concise. No emojis.
@@ -117,8 +130,11 @@ function buildSystemPrompt(workspacePath, conversationId, currentUserId, memory,
 ## Context
 - For current date/time, use: date
 - You have access to previous conversation context including tool results from prior turns.
-- For older history beyond your context, search log.jsonl (contains user messages and your final responses, but not tool results).
-- User messages include a \`[in-thread:TS]\` marker when sent from within a Slack thread (TS is the root message timestamp). Without this marker, the message is a top-level channel message.
+- For older human-readable history beyond your context, search \`log.jsonl\` (contains user messages and your final responses, but not tool results).
+- Structured session history with tool results lives in \`${conversationPath}/sessions/\`.
+- The active top-level session is selected by \`${conversationPath}/sessions/current\`, which points to a timestamped \`.jsonl\` file in the same directory.
+- Scoped/thread sessions use fixed files at \`${conversationPath}/sessions/<scope_id>.jsonl\` (for example \`${conversationPath}/sessions/1777386320.800769.jsonl\`).
+- User messages include a \`[in-thread:TS]\` marker when sent from within a platform thread/reply (TS is the thread or parent message identifier). Without this marker, the message is a top-level conversation message.
 
 ${platform.formattingGuide}
 
@@ -134,11 +150,15 @@ ${envDescription}
 
 ## Workspace Layout
 ${workspacePath}/
-├── MEMORY.md                    # Global memory (all channels)
+├── MEMORY.md                    # Global memory (all conversations)
 ├── skills/                      # Global CLI tools you create
 └── ${conversationId}/           # This conversation
     ├── MEMORY.md                # Conversation-specific memory
-    ├── log.jsonl                # Message history (no tool results)
+    ├── log.jsonl                # Human-readable message history (no tool results)
+    ├── sessions/                # Structured session history used for context reconstruction
+    │   ├── current              # Active top-level session pointer
+    │   ├── <timestamp>_<id>.jsonl  # Top-level session files
+    │   └── <scope_id>.jsonl        # Scoped thread/reply session files
     ├── attachments/             # User-shared files
     ├── scratch/                 # Your working directory
     └── skills/                  # Conversation-specific tools
@@ -174,21 +194,19 @@ You can schedule events that wake you up at specific times or when external thin
 
 **Immediate** - Triggers as soon as harness sees the file. Use in scripts/webhooks to signal external events.
 \`\`\`json
-{"type": "immediate", "platform": "${platform.name}", "channelId": "${conversationId}", "userId": "<requester userId>", "text": "New GitHub issue opened"}
+{"type": "immediate", "platform": "${platform.name}", "conversationId": "${conversationId}", "conversationKind": "${conversationKind}", "userId": "${currentUserId ?? "<requester userId>"}", "text": "New GitHub issue opened"}
 \`\`\`
 
 **One-shot** - Triggers once at a specific time. Use for reminders.
 \`\`\`json
-{"type": "one-shot", "platform": "${platform.name}", "channelId": "${conversationId}", "userId": "<requester userId>", "text": "Remind Mario about dentist", "at": "2025-12-15T09:00:00+01:00"}
+{"type": "one-shot", "platform": "${platform.name}", "conversationId": "${conversationId}", "conversationKind": "${conversationKind}", "userId": "${currentUserId ?? "<requester userId>"}", "text": "Remind Mario about dentist", "at": "2025-12-15T09:00:00+01:00"}
 \`\`\`
 
 **Periodic** - Triggers on a cron schedule. Use for recurring tasks.
 \`\`\`json
-{"type": "periodic", "platform": "${platform.name}", "channelId": "${conversationId}", "userId": "<requester userId>", "text": "Check inbox and summarize", "schedule": "0 9 * * 1-5", "timezone": "${Intl.DateTimeFormat().resolvedOptions().timeZone}"}
+{"type": "periodic", "platform": "${platform.name}", "conversationId": "${conversationId}", "conversationKind": "${conversationKind}", "userId": "${currentUserId ?? "<requester userId>"}", "text": "Check inbox and summarize", "schedule": "0 9 * * 1-5", "timezone": "${Intl.DateTimeFormat().resolvedOptions().timeZone}"}
 \`\`\`
 
-Set \`userId\` to the platform userId of whoever asked for the event (look it up in the user mappings above). When the event fires, tool execution will route to the sandbox vault selection for that user so the right credentials are available. In shared container mode, all events use the container's single shared vault.
-
 ### Cron Format
 \`minute hour day-of-month month day-of-week\`
 - \`0 9 * * *\` = daily at 9:00
@@ -199,23 +217,18 @@ Set \`userId\` to the platform userId of whoever asked for the event (look it up
 ### Timezones
 All \`at\` timestamps must include offset (e.g., \`+01:00\`). Periodic events use IANA timezone names. The harness runs in ${Intl.DateTimeFormat().resolvedOptions().timeZone}. When users mention times without timezone, assume ${Intl.DateTimeFormat().resolvedOptions().timeZone}.
 
-### Platform Routing
-Set \`platform\` to the target bot platform (\`${platform.name}\` for this conversation). When only one platform is running, omitting \`platform\` is allowed for backward compatibility, but include it by default to avoid ambiguity.
+### Platform and Credential Routing
+Set \`platform\` to the target bot platform (\`${platform.name}\` for this conversation). Include it explicitly to avoid ambiguity.
 
-### Creating Events
-Prefer the \`event\` tool. It automatically writes to the correct events directory and fills the current \`platform\`, \`channelId\`, and requester \`userId\`.
-Do not use \`bash\` or \`write\` to hand-create JSON files in \`/events\` unless the user explicitly asks for manual file editing.
+Set \`userId\` to the platform userId of whoever asked for the event. When the event fires, tool execution routes using that user's vault selection in per-user modes. In \`container:<name>\`, events use the container's single shared vault.
 
-Current conversation defaults:
-- \`platform\`: \`${platform.name}\`
-- \`channelId\`: \`${conversationId}\`
-- \`userId\`: \`${currentUserId ?? "unknown"}\`
+Prefer the \`event\` tool over manually writing JSON files; it fills \`platform\`, \`conversationId\`, \`conversationKind\`, and \`userId\` for the current conversation automatically.
 
-Manual file creation is fallback only:
+### Creating Events
 Use unique filenames to avoid overwriting existing events. Include a timestamp or random suffix:
 \`\`\`bash
 cat > ${workspacePath}/events/dentist-reminder-$(date +%s).json << 'EOF'
-{"type": "one-shot", "platform": "${platform.name}", "channelId": "${conversationId}", "userId": "<requester userId>", "text": "Dentist tomorrow", "at": "2025-12-14T09:00:00+01:00"}
+{"type": "one-shot", "platform": "${platform.name}", "conversationId": "${conversationId}", "conversationKind": "${conversationKind}", "userId": "${currentUserId ?? "<requester userId>"}", "text": "Dentist tomorrow", "at": "2025-12-14T09:00:00+01:00"}
 EOF
 \`\`\`
 Or check if file exists first before creating.
@@ -252,7 +265,7 @@ ${memory}
 
 ## System Configuration Log
 Maintain ${workspacePath}/SYSTEM.md to log all environment modifications:
-- Installed packages (apk add, npm install, pip install)
+- Installed packages (apt install, npm install, uv pip install)
 - Environment variables set
 - Config files modified (~/.gitconfig, cron jobs, etc.)
 - Skill dependencies installed
@@ -262,7 +275,8 @@ Update this file whenever you modify the environment. On fresh container, read i
 ## Log Queries (for older history)
 Format: \`{"date":"...","ts":"...","user":"...","userName":"...","text":"...","isBot":false}\`
 The log contains user messages and your final responses (not tool calls/results).
-${isContainer ? "Install jq: apk add jq" : ""}
+Use \`log.jsonl\` for quick grep-style history. Use \`${conversationPath}/sessions/\` when you need structured turns, tool outputs, or branch lineage.
+${isContainer ? "Install jq: apt-get install jq" : ""}
 ${isFirecracker ? "Install jq: apt-get install jq" : ""}
 
 \`\`\`bash
@@ -274,6 +288,10 @@ grep -i "topic" log.jsonl | jq -c '{date: .date[0:19], user: (.userName // .user
 
 # Messages from specific user
 grep '"userName":"mario"' log.jsonl | tail -20 | jq -c '{date: .date[0:19], text}'
+
+# Inspect top-level session pointer and available session files
+cat sessions/current
+ls -1 sessions/
 \`\`\`
 
 ## Tools
@@ -291,6 +309,12 @@ function truncate(text, maxLen) {
         return text;
     return `${text.substring(0, maxLen - 3)}...`;
 }
+// Tools whose output is interesting in the structured session log but too noisy
+// to surface as a per-tool diagnostic to the user.
+const QUIET_TOOLS = new Set(["read", "write", "edit"]);
+// Cap raw tool output before handing it to adapters. Bash output can be MB; without
+// this each adapter's splitter would fan it out into many sequential platform posts.
+const TOOL_RESULT_DIAGNOSTIC_CAP = 8000;
 function extractToolResultText(result) {
     if (typeof result === "string") {
         return result;
@@ -312,55 +336,29 @@ function extractToolResultText(result) {
     }
     return JSON.stringify(result);
 }
-function formatToolArgsForSlack(_toolName, args) {
-    const lines = [];
-    for (const [key, value] of Object.entries(args)) {
-        if (key === "label")
-            continue;
-        if (key === "path" && typeof value === "string") {
-            const offset = args.offset;
-            const limit = args.limit;
-            if (offset !== undefined && limit !== undefined) {
-                lines.push(`${value}:${offset}-${offset + limit}`);
-            }
-            else {
-                lines.push(value);
-            }
-            continue;
-        }
-        if (key === "offset" || key === "limit")
-            continue;
-        if (typeof value === "string") {
-            lines.push(value);
-        }
-        else {
-            lines.push(JSON.stringify(value));
-        }
-    }
-    return lines.join("\n");
-}
 // ============================================================================
 // Agent runner
 // ============================================================================
 /**
- * Create a new AgentRunner for a conversation.
+ * Create a new AgentRunner for a channel.
  * Sets up the session and subscribes to events once.
  *
- * Runner caching is handled by the caller (conversationStates in main.ts).
+ * Runner caching is handled by the caller (channelStates in main.ts).
  * This is a stateless factory function.
  */
-export async function createRunner(sandboxConfig, sessionKey, conversationId, conversationDir, workspaceDir, vaultManager, bindingStore, provisioner, stateDir) {
-    const agentConfig = loadAgentConfig(stateDir ?? workspaceDir);
+export async function createRunner(sandboxConfig, sessionKey, conversationId, conversationDir, workspaceDir, sessionScope, vaultManager, bindingStore, provisioner) {
+    const agentConfig = loadAgentConfig(workspaceDir);
     // Initialize logger with settings from config
     log.initLogger({
         logFormat: agentConfig.logFormat,
         logLevel: agentConfig.logLevel,
     });
     const executionResolver = vaultManager &&
+        sandboxConfig.type !== "host" &&
         (vaultManager.isEnabled() ||
             !!bindingStore ||
-            sandboxConfig.type === "image" ||
-            sandboxConfig.type === "container")
+            sandboxConfig.type === "container" ||
+            sandboxConfig.type === "image")
         ? new ActorExecutionResolver(sandboxConfig, vaultManager, bindingStore, provisioner)
         : undefined;
     let activeExecutor = executionResolver !== undefined
@@ -378,7 +376,6 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
         },
     };
     const workspaceBase = conversationDir.replace(`/${conversationId}`, "");
-    // Compute workspace path from the current executor. This may change per run.
     const getWorkspacePath = () => executor.getWorkspacePath(workspaceBase);
     let workspacePath = getWorkspacePath();
     // Create tools (per-runner, with per-runner upload function setter)
@@ -392,52 +389,24 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
     const memory = await getMemory(conversationDir);
     const skills = loadMamaSkills(conversationDir, workspacePath);
     const emptyPlatform = {
-        name: "slack",
+        name: "chat",
         formattingGuide: "",
         channels: [],
         users: [],
     };
-    const systemPrompt = buildSystemPrompt(workspacePath, conversationId, undefined, memory, sandboxConfig, emptyPlatform, skills);
-    // Create session manager and settings manager.
-    // Top-level conversation sessions use {conversationDir}/sessions/current.
-    // Thread sessions use fixed files: {conversationDir}/sessions/{threadTs}.jsonl.
-    const sessionDir = getChannelSessionDir(conversationDir);
+    const systemPrompt = buildSystemPrompt(workspacePath, conversationId, "shared", undefined, memory, sandboxConfig, emptyPlatform, skills);
+    // Create session manager and settings manager. Top-level/private sessions
+    // use the conversation's current pointer; scoped sessions use fixed files.
+    // Platform-specific branch/fork behavior is resolved before runner creation.
     const isThread = sessionKey.includes(":");
-    let sessionManager;
-    let sessionFile;
-    if (isThread) {
-        const threadFile = getThreadSessionFile(conversationDir, sessionKey);
-        const existing = tryResolveThreadSession(threadFile);
-        if (existing) {
-            sessionFile = existing;
-            sessionManager = openManagedSession(sessionFile, sessionDir, conversationDir);
-        }
-        else {
-            const conversationSource = resolveChannelSessionFile(conversationDir);
-            if (conversationSource) {
-                try {
-                    sessionFile = forkThreadSessionFile(conversationSource, threadFile, conversationDir);
-                    sessionManager = openManagedSession(sessionFile, sessionDir, conversationDir);
-                }
-                catch {
-                    sessionFile = createManagedSessionFileAtPath(threadFile, conversationDir);
-                    sessionManager = openManagedSession(sessionFile, sessionDir, conversationDir);
-                }
-            }
-            else {
-                sessionFile = createManagedSessionFileAtPath(threadFile, conversationDir);
-                sessionManager = openManagedSession(sessionFile, sessionDir, conversationDir);
-            }
-        }
-    }
-    else {
-        // Top-level conversation session: resolve the current session file.
-        sessionFile = resolveManagedSessionFile(sessionDir, conversationDir);
-        sessionManager = openManagedSession(sessionFile, sessionDir, conversationDir);
-    }
-    const sessionUuid = extractSessionUuid(sessionFile);
-    // Used for Slack thread filtering — for non-Slack platforms this is effectively a no-op
     const rootTs = extractSessionSuffix(sessionKey);
+    const { sessionDir, contextFile, threadRootMessage } = sessionScope;
+    const sessionManager = openManagedSession(contextFile, sessionDir, conversationDir);
+    const threadSessionName = buildThreadSessionName(threadRootMessage);
+    if (isThread && threadSessionName && sessionManager.getSessionName() !== threadSessionName) {
+        sessionManager.appendSessionInfo(threadSessionName);
+    }
+    const sessionUuid = extractSessionUuid(contextFile);
     const settingsManager = createMamaSettingsManager(join(conversationDir, ".."));
     // Create AuthStorage and ModelRegistry
     // Auth stored outside workspace so agent can't access it
@@ -463,7 +432,7 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
     const loadedSession = sessionManager.buildSessionContext();
     if (loadedSession.messages.length > 0) {
         agent.state.messages = loadedSession.messages;
-        log.logInfo(`[${conversationId}] Loaded ${loadedSession.messages.length} messages from session file`);
+        log.logInfo(`[${conversationId}] Loaded ${loadedSession.messages.length} messages from context.jsonl`);
     }
     // Load extensions, skills, prompts, themes via DefaultResourceLoader
     // This reads ~/.pi/agent/settings.json (packages, extensions enable/disable)
@@ -535,8 +504,6 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
                 ...baseAttrs,
             });
             log.logToolStart(logCtx, agentEvent.toolName, label, agentEvent.args);
-            // Tool labels are omitted from the main message to reduce Slack noise.
-            // Tool execution details are still posted to the thread (see tool_execution_end).
         }
         else if (event.type === "tool_execution_end") {
             const agentEvent = event;
@@ -570,24 +537,16 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
             else {
                 log.logToolSuccess(logCtx, agentEvent.toolName, durationMs, resultStr);
             }
-            // Post args + result to thread
-            const label = pending?.args ? pending.args.label : undefined;
-            const argsFormatted = pending
-                ? formatToolArgsForSlack(agentEvent.toolName, pending.args)
-                : "(args not found)";
-            const duration = (durationMs / 1000).toFixed(1);
-            let threadMessage = `*${agentEvent.isError ? "✗" : "✓"} ${agentEvent.toolName}*`;
-            if (label)
-                threadMessage += `: ${label}`;
-            threadMessage += ` (${duration}s)\n`;
-            if (argsFormatted)
-                threadMessage += `\`\`\`\n${argsFormatted}\n\`\`\`\n`;
-            threadMessage += `*Result:*\n\`\`\`\n${resultStr}\n\`\`\``;
-            // Only post thread details for tools with meaningful output (bash, attach).
-            // Skip read/write/edit to reduce Slack noise — their results are in the log.
-            const quietTools = new Set(["read", "write", "edit"]);
-            if (!quietTools.has(agentEvent.toolName)) {
-                queue.enqueueMessage(threadMessage, "thread", "tool result thread", false);
+            if (!QUIET_TOOLS.has(agentEvent.toolName)) {
+                const toolResult = {
+                    toolName: agentEvent.toolName,
+                    label: pending?.args ? pending.args.label : undefined,
+                    args: pending?.args,
+                    result: truncate(resultStr, TOOL_RESULT_DIAGNOSTIC_CAP),
+                    isError: agentEvent.isError,
+                    durationMs,
+                };
+                queue.enqueue(() => responseCtx.respondToolResult(toolResult), "tool result diagnostic");
             }
             if (agentEvent.isError) {
                 queue.enqueue(() => responseCtx.respond(`_Error: ${truncate(resultStr, 200)}_`), "tool error");
@@ -679,16 +638,12 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
                 const text = textParts.join("\n");
                 for (const thinking of thinkingParts) {
                     log.logThinking(logCtx, thinking);
-                    queue.enqueueMessage(`_${thinking}_`, "main", "thinking main");
-                    queue.enqueueMessage(`_${thinking}_`, "thread", "thinking thread", false);
+                    queue.enqueue(() => responseCtx.respond(`_${thinking}_`), "thinking main");
+                    queue.enqueue(() => responseCtx.respondDiagnostic(`_${thinking}_`), "thinking diagnostic");
                 }
                 if (text.trim()) {
                     log.logResponse(logCtx, text);
-                    queue.enqueueMessage(text, "main", "response main");
-                    // Only overflow to thread for texts that will be truncated in main
-                    if (text.length > SLACK_MAX_LENGTH) {
-                        queue.enqueueMessage(text, "thread", "response thread", false);
-                    }
+                    queue.enqueue(() => responseCtx.respond(text), "response main");
                 }
             }
         }
@@ -711,33 +666,12 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
             queue.enqueue(() => responseCtx.respond(`_Retrying (${retryEvent.attempt}/${retryEvent.maxAttempts})..._`), "retry");
         }
     });
-    // Message limit constant
-    const SLACK_MAX_LENGTH = 40000;
-    const splitForSlack = (text) => {
-        if (text.length <= SLACK_MAX_LENGTH)
-            return [text];
-        const parts = [];
-        let remaining = text;
-        let partNum = 1;
-        while (remaining.length > 0) {
-            const chunk = remaining.substring(0, SLACK_MAX_LENGTH - 50);
-            remaining = remaining.substring(SLACK_MAX_LENGTH - 50);
-            const suffix = remaining.length > 0 ? `\n_(continued ${partNum}...)_` : "";
-            parts.push(chunk + suffix);
-            partNum++;
-        }
-        return parts;
-    };
     return {
         async run(message, responseCtx, platform) {
             // Extract conversationId from sessionKey (format: "conversationId:rootTs" or just "conversationId")
-            const sessionConversationId = message.sessionKey.split(":")[0];
-            // Ensure the conversation directory exists
+            const sessionConversation = message.sessionKey.split(":")[0];
+            // Ensure conversation directory exists
             await mkdir(conversationDir, { recursive: true });
-            // Refresh vault config and clear executor cache so credential changes
-            // (env file updates, vault.json edits, token rotations) take effect.
-            // Then set the active actor BEFORE building system prompt, so workspacePath
-            // reflects the actor's sandbox type.
             if (executionResolver) {
                 executionResolver.refresh();
                 activeExecutor = await executionResolver.resolve({
@@ -757,35 +691,38 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
             if (syncedCount > 0) {
                 log.logInfo(`[${conversationId}] Synced ${syncedCount} messages from log.jsonl`);
             }
-            // Reload messages from the session file.
-            // This picks up any messages synced above.
+            // Reload messages from context.jsonl
+            // This picks up any messages synced above
             const reloadedSession = sessionManager.buildSessionContext();
             if (reloadedSession.messages.length > 0) {
                 agent.state.messages = reloadedSession.messages;
                 log.logInfo(`[${conversationId}] Reloaded ${reloadedSession.messages.length} messages from context`);
             }
             // Update system prompt with fresh memory, channel/user info, and skills
-            // Use the actual executor's sandbox config, not the initial config,
-            // to ensure accurate environment description for the model
             const memory = await getMemory(conversationDir);
             const skills = loadMamaSkills(conversationDir, workspacePath);
-            const actualSandboxConfig = executor.getSandboxConfig();
-            const systemPrompt = buildSystemPrompt(workspacePath, conversationId, message.userId, memory, actualSandboxConfig, platform, skills);
+            const systemPrompt = buildSystemPrompt(workspacePath, conversationId, message.conversationKind, message.userId, memory, executor.getSandboxConfig(), platform, skills);
             session.agent.state.systemPrompt = systemPrompt;
-            // Set up file upload function
-            setUploadFunction(async (filePath, title) => {
-                const hostPath = translateToHostPath(filePath, conversationDir, workspacePath, conversationId);
-                await responseCtx.uploadFile(hostPath, title);
-            });
             setEventContext({
                 platform: platform.name,
                 conversationId,
+                conversationKind: message.conversationKind,
                 userId: message.userId,
+                sessionKey: message.sessionKey,
+                // For Slack scheduled events, preserve thread targeting only when the
+                // request was created inside an existing thread. Top-level reminders
+                // should come back as top-level messages.
+                threadTs: message.threadTs,
+            });
+            // Set up file upload function
+            setUploadFunction(async (filePath, title) => {
+                const hostPath = translateToHostPath(filePath, conversationDir, workspacePath, conversationId);
+                await responseCtx.uploadFile(hostPath, title);
             });
             // Reset per-run state
             runState.responseCtx = responseCtx;
             runState.logCtx = {
-                conversationId: sessionConversationId,
+                conversationId: sessionConversation,
                 userName: message.userName,
                 conversationName: undefined,
                 sessionId: sessionUuid,
@@ -813,11 +750,7 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
                             const errMsg = err instanceof Error ? err.message : String(err);
                             log.logWarning(`API error (${errorContext})`, errMsg);
                             try {
-                                // Split long error messages to avoid msg_too_long
-                                const errParts = splitForSlack(`_Error: ${errMsg}_`);
-                                for (const part of errParts) {
-                                    await responseCtx.respondInThread(part);
-                                }
+                                await responseCtx.respondDiagnostic(`Error: ${errMsg}`, { style: "error" });
                             }
                             catch {
                                 // Ignore
@@ -825,12 +758,6 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
                         }
                     });
                 },
-                enqueueMessage(text, target, errorContext, _doLog = true) {
-                    const parts = splitForSlack(text);
-                    for (const part of parts) {
-                        this.enqueue(() => target === "main" ? responseCtx.respond(part) : responseCtx.respondInThread(part), errorContext);
-                    }
-                },
             };
             // Log context info
             log.logInfo(`Context sizes - system: ${systemPrompt.length} chars, memory: ${memory.length} chars`);
@@ -849,7 +776,7 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
             const imageAttachments = [];
             const nonImagePaths = [];
             for (const a of message.attachments || []) {
-                // a.localPath is the path relative to the workspace
+                // a.localPath is the path relative to the workspace.
                 const fullPath = `${workspacePath}/${a.localPath}`;
                 const mimeType = getImageMimeType(a.localPath);
                 if (mimeType && existsSync(fullPath)) {
@@ -882,7 +809,7 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
             addLifecycleBreadcrumb("agent.prompt.sent", {
                 provider: model.provider,
                 model: agentConfig.model,
-                channel_id: sessionConversationId,
+                channel_id: sessionConversation,
                 session_id: sessionUuid,
                 attachment_count: message.attachments?.length ?? 0,
                 image_attachment_count: imageAttachments.length,
@@ -894,11 +821,9 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
             if (runState.stopReason === "error" && runState.errorMessage) {
                 try {
                     await responseCtx.replaceResponse("_Sorry, something went wrong_");
-                    // Split long error messages to avoid msg_too_long
-                    const errorParts = splitForSlack(`_Error: ${runState.errorMessage}_`);
-                    for (const part of errorParts) {
-                        await responseCtx.respondInThread(part);
-                    }
+                    await responseCtx.respondDiagnostic(`Error: ${runState.errorMessage}`, {
+                        style: "error",
+                    });
                 }
                 catch (err) {
                     const errMsg = err instanceof Error ? err.message : String(err);
@@ -926,10 +851,7 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
                 }
                 else if (finalText.trim()) {
                     try {
-                        const mainText = finalText.length > SLACK_MAX_LENGTH
-                            ? `${finalText.substring(0, SLACK_MAX_LENGTH - 50)}\n\n_(see thread for full response)_`
-                            : finalText;
-                        await responseCtx.replaceResponse(mainText);
+                        await responseCtx.replaceResponse(finalText);
                     }
                     catch (err) {
                         const errMsg = err instanceof Error ? err.message : String(err);
@@ -957,7 +879,7 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
                 const runMetricAttributes = metricAttributes({
                     provider: model.provider,
                     model: agentConfig.model,
-                    channel_id: sessionConversationId,
+                    channel_id: sessionConversation,
                     session_id: sessionUuid,
                     stop_reason: runState.stopReason,
                     llm_calls: runState.llmCallCount,
@@ -982,12 +904,10 @@ export async function createRunner(sandboxConfig, sessionKey, conversationId, co
                     attributes: runMetricAttributes,
                 });
                 const summary = log.logUsageSummary(runState.logCtx, runState.totalUsage, contextTokens, contextWindow);
-                // Split long summaries to avoid msg_too_long
-                const summaryParts = splitForSlack(summary);
-                for (const part of summaryParts) {
-                    runState.queue.enqueue(() => responseCtx.respondInThread(part, { style: "muted" }), "usage summary");
+                if (platform.diagnostics?.showUsageSummary === true) {
+                    runState.queue.enqueue(() => responseCtx.respondDiagnostic(summary, { style: "muted" }), "usage summary");
+                    await queueChain;
                 }
-                await queueChain;
             }
             // Clear run state
             runState.responseCtx = null;