sparkecoder 0.1.119 → 0.1.120

package/dist/db/index.d.ts

@@ -1,5 +1,5 @@
-import { C as Checkpoint, F as FileBackup, M as ModelMessage, a as Message, S as Session, L as LoadedSkill, T as TodoItem, b as ToolExecution, A as ActiveStream, I as IndexStatusRecord, c as IndexedChunk, d as SubagentExecution, e as SubagentStep, f as Terminal } from '../schema-BWbWmfDQ.js';
-export { N as NewActiveStream, g as NewCheckpoint, h as NewFileBackup, i as NewIndexStatusRecord, j as NewIndexedChunk, k as NewMessage, l as NewSession, m as NewSubagentExecution, n as NewTerminal, o as NewTodoItem, p as NewToolExecution, q as SessionConfig, r as TaskConfig, U as UserContentPart, s as UserFilePart, t as UserImagePart, u as UserModelMessage, v as UserTextPart } from '../schema-BWbWmfDQ.js';
+import { C as Checkpoint, F as FileBackup, M as ModelMessage, a as Message, S as Session, L as LoadedSkill, T as TodoItem, b as ToolExecution, A as ActiveStream, I as IndexStatusRecord, c as IndexedChunk, d as SubagentExecution, e as SubagentStep, f as Terminal } from '../schema-DxrKyetI.js';
+export { N as NewActiveStream, g as NewCheckpoint, h as NewFileBackup, i as NewIndexStatusRecord, j as NewIndexedChunk, k as NewMessage, l as NewSession, m as NewSubagentExecution, n as NewTerminal, o as NewTodoItem, p as NewToolExecution, q as SessionConfig, r as TaskConfig, U as UserContentPart, s as UserFilePart, t as UserImagePart, u as UserModelMessage, v as UserTextPart } from '../schema-DxrKyetI.js';
 import 'drizzle-orm/sqlite-core';
 
 /**

package/dist/{index-Bcz0aCAR.d.ts → index-DczYH89U.d.ts}

@@ -1,7 +1,7 @@
 import { ModelMessage, streamText } from 'ai';
-import { S as Session, b as ToolExecution, r as TaskConfig } from './schema-BWbWmfDQ.js';
+import { S as Session, b as ToolExecution, r as TaskConfig } from './schema-DxrKyetI.js';
 import { z } from 'zod';
-import { B as BashToolProgress, W as WriteFileProgress, S as SearchToolProgress } from './search-DOzC4ojH.js';
+import { B as BashToolProgress, W as WriteFileProgress, S as SearchToolProgress } from './search-CVVfuBPZ.js';
 
 declare const ToolApprovalConfigSchema: z.ZodObject<{
     bash: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -38,25 +38,25 @@ declare const SessionConfigSchema: z.ZodObject<{
         iterations: z.ZodOptional<z.ZodNumber>;
         parentTaskId: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
-        status: "completed" | "failed" | "running";
+        status: "running" | "completed" | "failed";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        error?: string | undefined;
-        maxIterations?: number | undefined;
         webhookUrl?: string | undefined;
-        parentTaskId?: string | undefined;
+        maxIterations?: number | undefined;
         result?: unknown;
+        error?: string | undefined;
         iterations?: number | undefined;
+        parentTaskId?: string | undefined;
     }, {
-        status: "completed" | "failed" | "running";
+        status: "running" | "completed" | "failed";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        error?: string | undefined;
-        maxIterations?: number | undefined;
         webhookUrl?: string | undefined;
-        parentTaskId?: string | undefined;
+        maxIterations?: number | undefined;
         result?: unknown;
+        error?: string | undefined;
         iterations?: number | undefined;
+        parentTaskId?: string | undefined;
     }>>;
     role: z.ZodOptional<z.ZodEnum<["orchestrator", "worker", "chat"]>>;
     personality: z.ZodOptional<z.ZodString>;
@@ -84,20 +84,20 @@ declare const SessionConfigSchema: z.ZodObject<{
         lastFiredAt: z.ZodOptional<z.ZodString>;
         createdAt: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        enabled: boolean;
         id: string;
         name: string;
-        enabled: boolean;
-        createdAt: string;
-        prompt: string;
         cron: string;
+        prompt: string;
+        createdAt: string;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
     }, {
         id: string;
         name: string;
-        createdAt: string;
-        prompt: string;
         cron: string;
+        prompt: string;
+        createdAt: string;
         enabled?: boolean | undefined;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
@@ -112,19 +112,19 @@ declare const SessionConfigSchema: z.ZodObject<{
         lastHitAt: z.ZodOptional<z.ZodString>;
         createdAt: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        token: string;
         id: string;
         name: string;
         createdAt: string;
+        token: string;
         wake: "now" | "next";
         hitCount: number;
         template?: string | undefined;
         lastHitAt?: string | undefined;
     }, {
-        token: string;
         id: string;
         name: string;
         createdAt: string;
+        token: string;
         wake?: "now" | "next" | undefined;
         template?: string | undefined;
         hitCount?: number | undefined;
@@ -134,90 +134,90 @@ declare const SessionConfigSchema: z.ZodObject<{
     maxContextChars: number;
     toolApprovals?: Record<string, boolean> | undefined;
     approvalWebhook?: string | undefined;
-    webhooks?: {
-        token: string;
-        id: string;
-        name: string;
-        createdAt: string;
-        wake: "now" | "next";
-        hitCount: number;
-        template?: string | undefined;
-        lastHitAt?: string | undefined;
-    }[] | undefined;
-    slack?: {
-        channel?: string | undefined;
-        threadTs?: string | undefined;
-        teamId?: string | undefined;
-    } | undefined;
+    skillsDirectory?: string | undefined;
     task?: {
-        status: "completed" | "failed" | "running";
+        status: "running" | "completed" | "failed";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        error?: string | undefined;
-        maxIterations?: number | undefined;
         webhookUrl?: string | undefined;
-        parentTaskId?: string | undefined;
+        maxIterations?: number | undefined;
         result?: unknown;
+        error?: string | undefined;
         iterations?: number | undefined;
+        parentTaskId?: string | undefined;
     } | undefined;
-    skillsDirectory?: string | undefined;
     role?: "orchestrator" | "worker" | "chat" | undefined;
     personality?: string | undefined;
     orchestratorSessionId?: string | undefined;
+    slack?: {
+        channel?: string | undefined;
+        threadTs?: string | undefined;
+        teamId?: string | undefined;
+    } | undefined;
     schedules?: {
+        enabled: boolean;
         id: string;
         name: string;
-        enabled: boolean;
-        createdAt: string;
-        prompt: string;
         cron: string;
+        prompt: string;
+        createdAt: string;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
     }[] | undefined;
-}, {
-    toolApprovals?: Record<string, boolean> | undefined;
-    approvalWebhook?: string | undefined;
     webhooks?: {
-        token: string;
         id: string;
         name: string;
         createdAt: string;
-        wake?: "now" | "next" | undefined;
+        token: string;
+        wake: "now" | "next";
+        hitCount: number;
         template?: string | undefined;
-        hitCount?: number | undefined;
         lastHitAt?: string | undefined;
     }[] | undefined;
-    slack?: {
-        channel?: string | undefined;
-        threadTs?: string | undefined;
-        teamId?: string | undefined;
-    } | undefined;
+}, {
+    toolApprovals?: Record<string, boolean> | undefined;
+    approvalWebhook?: string | undefined;
+    skillsDirectory?: string | undefined;
+    maxContextChars?: number | undefined;
     task?: {
-        status: "completed" | "failed" | "running";
+        status: "running" | "completed" | "failed";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        error?: string | undefined;
-        maxIterations?: number | undefined;
         webhookUrl?: string | undefined;
-        parentTaskId?: string | undefined;
+        maxIterations?: number | undefined;
         result?: unknown;
+        error?: string | undefined;
         iterations?: number | undefined;
+        parentTaskId?: string | undefined;
     } | undefined;
-    skillsDirectory?: string | undefined;
-    maxContextChars?: number | undefined;
     role?: "orchestrator" | "worker" | "chat" | undefined;
     personality?: string | undefined;
     orchestratorSessionId?: string | undefined;
+    slack?: {
+        channel?: string | undefined;
+        threadTs?: string | undefined;
+        teamId?: string | undefined;
+    } | undefined;
     schedules?: {
         id: string;
         name: string;
-        createdAt: string;
-        prompt: string;
         cron: string;
+        prompt: string;
+        createdAt: string;
         enabled?: boolean | undefined;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
     }[] | undefined;
+    webhooks?: {
+        id: string;
+        name: string;
+        createdAt: string;
+        token: string;
+        wake?: "now" | "next" | undefined;
+        template?: string | undefined;
+        hitCount?: number | undefined;
+        lastHitAt?: string | undefined;
+    }[] | undefined;
 }>;
 declare const SparkcoderConfigSchema: z.ZodObject<{
     defaultModel: z.ZodDefault<z.ZodString>;
@@ -383,15 +383,15 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
                 expiresAt?: string | undefined;
             }>>;
         }, "strip", z.ZodTypeAny, {
+            enabled: boolean;
             id: string;
             name: string;
-            transport: "http" | "sse" | "stdio";
-            enabled: boolean;
             createdAt: string;
+            transport: "http" | "sse" | "stdio";
+            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
-            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -404,13 +404,13 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         }, {
             id: string;
             name: string;
-            transport: "http" | "sse" | "stdio";
             createdAt: string;
+            transport: "http" | "sse" | "stdio";
+            enabled?: boolean | undefined;
+            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
-            args?: string[] | undefined;
-            enabled?: boolean | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -423,15 +423,15 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         }>, "many">>>>;
     }, "strip", z.ZodTypeAny, {
         servers?: {
+            enabled: boolean;
             id: string;
             name: string;
-            transport: "http" | "sse" | "stdio";
-            enabled: boolean;
             createdAt: string;
+            transport: "http" | "sse" | "stdio";
+            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
-            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -446,13 +446,13 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         servers?: {
             id: string;
             name: string;
-            transport: "http" | "sse" | "stdio";
             createdAt: string;
+            transport: "http" | "sse" | "stdio";
+            enabled?: boolean | undefined;
+            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
-            args?: string[] | undefined;
-            enabled?: boolean | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -495,7 +495,6 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         allowedEmails?: string[] | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    defaultModel: string;
     toolApprovals: {
         bash: boolean;
         write_file: boolean;
@@ -503,6 +502,7 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         load_skill: boolean;
         todo: boolean;
     };
+    defaultModel: string;
     skills: {
         directory: string;
         additionalDirectories: string[];
@@ -518,11 +518,21 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         publicUrl?: string | undefined;
     };
     databasePath: string;
-    workingDirectory?: string | undefined;
     approvalWebhook?: string | undefined;
+    slack?: {
+        botToken?: string | undefined;
+        signingSecret?: string | undefined;
+        defaultOrchestratorName?: string | undefined;
+        allowedUsers?: string[] | undefined;
+        allowedChannels?: string[] | undefined;
+        allowDmsFromAnyone?: boolean | undefined;
+        deniedReplyEnabled?: boolean | undefined;
+        deniedReplyTemplate?: string | undefined;
+    } | undefined;
     webhooks?: {
         token?: string | undefined;
     } | undefined;
+    workingDirectory?: string | undefined;
     remoteServer?: {
         url?: string | undefined;
         authKey?: string | undefined;
@@ -535,27 +545,17 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         httpUrl?: string | undefined;
         namespace?: string | undefined;
     } | undefined;
-    slack?: {
-        botToken?: string | undefined;
-        signingSecret?: string | undefined;
-        defaultOrchestratorName?: string | undefined;
-        allowedUsers?: string[] | undefined;
-        allowedChannels?: string[] | undefined;
-        allowDmsFromAnyone?: boolean | undefined;
-        deniedReplyEnabled?: boolean | undefined;
-        deniedReplyTemplate?: string | undefined;
-    } | undefined;
     mcp?: {
         servers?: {
+            enabled: boolean;
             id: string;
             name: string;
-            transport: "http" | "sse" | "stdio";
-            enabled: boolean;
             createdAt: string;
+            transport: "http" | "sse" | "stdio";
+            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
-            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -576,8 +576,6 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         allowedEmails?: string[] | undefined;
     } | undefined;
 }, {
-    defaultModel?: string | undefined;
-    workingDirectory?: string | undefined;
     toolApprovals?: {
         bash?: boolean | undefined;
         write_file?: boolean | undefined;
@@ -586,6 +584,21 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         todo?: boolean | undefined;
     } | undefined;
     approvalWebhook?: string | undefined;
+    slack?: {
+        botToken?: string | undefined;
+        signingSecret?: string | undefined;
+        defaultOrchestratorName?: string | undefined;
+        allowedUsers?: string[] | undefined;
+        allowedChannels?: string[] | undefined;
+        allowDmsFromAnyone?: boolean | undefined;
+        deniedReplyEnabled?: boolean | undefined;
+        deniedReplyTemplate?: string | undefined;
+    } | undefined;
+    webhooks?: {
+        token?: string | undefined;
+    } | undefined;
+    workingDirectory?: string | undefined;
+    defaultModel?: string | undefined;
     skills?: {
         directory?: string | undefined;
         additionalDirectories?: string[] | undefined;
@@ -600,9 +613,6 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         host?: string | undefined;
         publicUrl?: string | undefined;
     } | undefined;
-    webhooks?: {
-        token?: string | undefined;
-    } | undefined;
     databasePath?: string | undefined;
     remoteServer?: {
         url?: string | undefined;
@@ -616,27 +626,17 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         include?: string[] | undefined;
         exclude?: string[] | undefined;
     } | undefined;
-    slack?: {
-        botToken?: string | undefined;
-        signingSecret?: string | undefined;
-        defaultOrchestratorName?: string | undefined;
-        allowedUsers?: string[] | undefined;
-        allowedChannels?: string[] | undefined;
-        allowDmsFromAnyone?: boolean | undefined;
-        deniedReplyEnabled?: boolean | undefined;
-        deniedReplyTemplate?: string | undefined;
-    } | undefined;
     mcp?: {
         servers?: {
             id: string;
             name: string;
-            transport: "http" | "sse" | "stdio";
             createdAt: string;
+            transport: "http" | "sse" | "stdio";
+            enabled?: boolean | undefined;
+            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
-            args?: string[] | undefined;
-            enabled?: boolean | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { R as ResolvedConfig } from './index-Bcz0aCAR.js';
-export { A as Agent, a as AgentOptions, b as AgentRunOptions, c as AgentStreamResult, S as SparkcoderConfig, T as ToolApprovalConfig } from './index-Bcz0aCAR.js';
+import { R as ResolvedConfig } from './index-DczYH89U.js';
+export { A as Agent, a as AgentOptions, b as AgentRunOptions, c as AgentStreamResult, S as SparkcoderConfig, T as ToolApprovalConfig } from './index-DczYH89U.js';
 export { ServerOptions, createApp, startServer, stopServer } from './server/index.js';
 export { checkpointQueries, closeDatabase, fileBackupQueries, getDb, initDatabase, messageQueries, sessionQueries, skillQueries, todoQueries, toolExecutionQueries } from './db/index.js';
-import { F as FileBackup, C as Checkpoint } from './schema-BWbWmfDQ.js';
-export { a as Message, M as ModelMessage, S as Session, q as SessionConfig, f as Terminal, T as TodoItem, b as ToolExecution } from './schema-BWbWmfDQ.js';
+import { F as FileBackup, C as Checkpoint } from './schema-DxrKyetI.js';
+export { a as Message, M as ModelMessage, S as Session, q as SessionConfig, f as Terminal, T as TodoItem, b as ToolExecution } from './schema-DxrKyetI.js';
 export { createLoadSkillTool, createReadFileTool, createTodoTool, createTools } from './tools/index.js';
-export { c as createBashTool, a as createWriteFileTool } from './search-DOzC4ojH.js';
+export { c as createBashTool, a as createWriteFileTool } from './search-CVVfuBPZ.js';
 import 'ai';
 import 'zod';
 import 'hono/types';

package/dist/index.js

@@ -7819,6 +7819,9 @@ function isSlackConfigured() {
 function getSlackSigningSecret() {
   return readSlackConfig()?.signingSecret ?? null;
 }
+function getSlackBotToken() {
+  return readSlackConfig()?.botToken ?? null;
+}
 function getDefaultOrchestratorName() {
   return readSlackConfig()?.defaultOrchestratorName ?? null;
 }
@@ -7873,6 +7876,62 @@ function getSlackAllowlistPolicy() {
     return { allowedUsers: [], allowedChannels: [], allowDmsFromAnyone: true };
   }
 }
+async function fetchSlackUserName(userId) {
+  const token = getSlackBotToken();
+  if (!token) return null;
+  try {
+    const res = await fetch(`https://slack.com/api/users.info?user=${encodeURIComponent(userId)}`, {
+      headers: { Authorization: `Bearer ${token}` }
+    });
+    const data = await res.json().catch(() => ({}));
+    if (!data?.ok) {
+      console.warn(`[slack] users.info(${userId}) failed: ${data?.error || `HTTP ${res.status}`}`);
+      return null;
+    }
+    const profile = data.user?.profile || {};
+    const name = profile.display_name_normalized || profile.display_name || profile.real_name_normalized || profile.real_name || data.user?.real_name || data.user?.name || null;
+    return name ? String(name) : null;
+  } catch (err) {
+    console.warn(`[slack] users.info(${userId}) error:`, err?.message || err);
+    return null;
+  }
+}
+async function resolveSlackUserName(userId) {
+  if (!userId) return null;
+  const now = Date.now();
+  const hit = userNameCache.get(userId);
+  if (hit && hit.expiresAt > now) return hit.name;
+  const inflight = userInflight.get(userId);
+  if (inflight) return inflight;
+  const p = (async () => {
+    const name = await fetchSlackUserName(userId);
+    userNameCache.set(userId, {
+      name,
+      expiresAt: now + (name ? USER_TTL_MS : USER_FAIL_TTL_MS)
+    });
+    userInflight.delete(userId);
+    return name;
+  })();
+  userInflight.set(userId, p);
+  return p;
+}
+async function normalizeSlackMentions(text) {
+  if (!text) return text;
+  const userMentionRe = /<@([UW][A-Z0-9]+)(?:\|([^>]+))?>/g;
+  const userIds = /* @__PURE__ */ new Set();
+  for (const m of text.matchAll(userMentionRe)) {
+    if (!m[2]) userIds.add(m[1]);
+  }
+  if (userIds.size > 0) {
+    await Promise.all([...userIds].map((id) => resolveSlackUserName(id)));
+  }
+  return text.replace(userMentionRe, (_full, id, label) => {
+    if (label) return `${label} <@${id}>`;
+    const cached = userNameCache.get(id);
+    const name = cached?.name;
+    return name ? `${name} <@${id}>` : `<@${id}>`;
+  });
+}
 function getSlackDeniedReplyPolicy() {
   try {
     const cfg = getConfig();
@@ -7885,13 +7944,17 @@ function getSlackDeniedReplyPolicy() {
     return { enabled: true, template: DEFAULT_DENIED_TEMPLATE };
   }
 }
-var cachedSelf, selfInflight, DEFAULT_DENIED_TEMPLATE;
+var cachedSelf, selfInflight, USER_TTL_MS, USER_FAIL_TTL_MS, userNameCache, userInflight, DEFAULT_DENIED_TEMPLATE;
 var init_client3 = __esm({
   "src/integrations/slack/client.ts"() {
     "use strict";
     init_config();
     cachedSelf = null;
     selfInflight = null;
+    USER_TTL_MS = 60 * 60 * 1e3;
+    USER_FAIL_TTL_MS = 5 * 60 * 1e3;
+    userNameCache = /* @__PURE__ */ new Map();
+    userInflight = /* @__PURE__ */ new Map();
     DEFAULT_DENIED_TEMPLATE = "Sorry, you don't have permission to use this bot. (Contact the bot owner if you think this is a mistake.)";
   }
 });
@@ -7906,9 +7969,6 @@ function markThreadOwned(channel, threadTs) {
 function isThreadOwned(channel, threadTs) {
   return ownedThreads.has(threadKey(channel, threadTs));
 }
-function stripMention(text) {
-  return String(text || "").replace(/<@[^>]+>/g, "").trim();
-}
 function isSelfAuthored(event, self) {
   if (!self) return true;
   if (self.botId && event.bot_id && event.bot_id === self.botId) return true;
@@ -7923,14 +7983,22 @@ function slackEventToInboundResult(event, opts = {}) {
     return { event: null, dropReason: "bot_message" };
   }
   if (event.type === "message" && event.subtype && IGNORED_MESSAGE_SUBTYPES.has(event.subtype)) {
-    return { event: null, dropReason: "bot_message" };
+    return { event: null, dropReason: "ignored_subtype" };
   }
   const isDm = event.type === "message" && event.channel_type === "im";
   const isThreadReply = event.type === "message" && !isDm && typeof event.thread_ts === "string" && event.thread_ts !== event.ts;
+  const isNonThreadChannelMsg = event.type === "message" && !isDm && !isThreadReply && (event.channel_type === "channel" || event.channel_type === "group" || event.channel_type === "mpim" || // Some payload shapes omit channel_type for channel messages.
+  typeof event.channel === "string");
   if (event.type !== "app_mention" && !isDm && !isThreadReply) {
+    if (isNonThreadChannelMsg) {
+      return { event: null, dropReason: "non_thread_channel_msg" };
+    }
+    if (event.type !== "message") {
+      return { event: null, dropReason: "non_message_event" };
+    }
     return { event: null, dropReason: "unsupported_type" };
   }
-  const text = event.type === "app_mention" ? stripMention(event.text) : (event.text ?? "").trim();
+  const text = (event.text ?? "").trim();
   if (!text) return { event: null, dropReason: "empty_text" };
   const policy = getSlackAllowlistPolicy();
   const userAllowlistActive = policy.allowedUsers.length > 0;
@@ -13674,16 +13742,18 @@ init_webhook_events();
 init_inbox();
 var recentlyHandled = /* @__PURE__ */ new Map();
 var MAX_RECENT = 1e3;
-function alreadyHandled(channel, ts) {
+function wasHandled(channel, ts) {
   if (!channel || !ts) return false;
+  return recentlyHandled.has(`${channel}\u241F${ts}`);
+}
+function markHandled(channel, ts) {
+  if (!channel || !ts) return;
   const key2 = `${channel}\u241F${ts}`;
-  if (recentlyHandled.has(key2)) return true;
   recentlyHandled.set(key2, Date.now());
   if (recentlyHandled.size > MAX_RECENT) {
     const oldest = recentlyHandled.keys().next().value;
     if (oldest) recentlyHandled.delete(oldest);
   }
-  return false;
 }
 var slack = new Hono6();
 slack.post("/events", async (c) => {
@@ -13720,7 +13790,7 @@ slack.post("/events", async (c) => {
       textSnippet: typeof ev.text === "string" ? ev.text : void 0,
       meta: { ts: ev.ts, thread_ts: ev.thread_ts, team: ev.team, event_subtype: ev.subtype }
     });
-    if (alreadyHandled(ev.channel, ev.ts)) {
+    if (wasHandled(ev.channel, ev.ts)) {
       updateEvent(auditId, { status: "dropped", dropReason: "duplicate_delivery" });
       return c.json({ ok: true });
     }
@@ -13744,7 +13814,18 @@ slack.post("/events", async (c) => {
       }
       const orchestratorId = await findOrCreateOrchestratorId();
       if (orchestratorId) {
+        inbound.content = await normalizeSlackMentions(inbound.content);
+        if (ev.user) {
+          const speakerName = await resolveSlackUserName(ev.user);
+          if (speakerName) {
+            inbound.content = inbound.content.replace(
+              `user=${ev.user}`,
+              `user=${speakerName} <@${ev.user}>`
+            );
+          }
+        }
         pushToInbox(orchestratorId, inbound);
+        markHandled(ev.channel, ev.ts);
         updateEvent(auditId, { status: "routed", sessionId: orchestratorId });
       } else {
         updateEvent(auditId, { status: "error", error: "no orchestrator session available" });