@agent-native/core 0.164.3 → 0.164.11

package/corpus/templates/factory/app/routes/factory.tsx

@@ -1,5 +1,6 @@
 import {
   AgentToggleButton,
+  requestAgentChatThreadOpen,
   useChatModels,
 } from "@agent-native/core/client/agent-chat";
 import {
@@ -18,8 +19,9 @@ import {
   IconPlus,
   IconRefresh,
 } from "@tabler/icons-react";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { Link, useSearchParams } from "react-router";
+import { toast } from "sonner";
 
 import { FactoryAgentsView } from "@/components/factory/FactoryAgentsView";
 import { FactoryAuditView } from "@/components/factory/FactoryAuditView";
@@ -78,6 +80,7 @@ type TriageDecision = {
 type TriageItem = {
   itemId?: string;
   id?: string;
+  title?: string | null;
   source?: string | null;
   sourceName?: string | null;
   sourceUrl?: string | null;
@@ -87,6 +90,8 @@ type TriageItem = {
   reason?: string | null;
   decisionSummary?: string | null;
   decisions?: TriageDecision[] | null;
+  createdAt?: string | null;
+  updatedAt?: string | null;
 };
 
 type TriageRule = {
@@ -159,6 +164,7 @@ type FactoryAutomation = {
   timezone?: string | null;
   condition?: string | null;
   canUpdate?: boolean;
+  updatedAt?: string | number | null;
   runs?: FactoryAutomationRun[] | null;
   pastRuns?: FactoryAutomationRun[] | null;
 };
@@ -976,7 +982,8 @@ function AutomationsView({
         current.body === nextDraft.body &&
         current.model === nextDraft.model &&
         current.schedule === nextDraft.schedule &&
-        current.enabled === nextDraft.enabled
+        current.enabled === nextDraft.enabled &&
+        current.updatedAt === nextDraft.updatedAt
       ) {
         return current;
       }
@@ -986,16 +993,25 @@ function AutomationsView({
 
   async function saveAutomation() {
     if (!draft) return;
-    await saveMutation.mutateAsync({
-      factoryId,
-      automationId: draft.id,
-      name: draft.name,
-      prompt: draft.prompt ?? draft.body ?? "",
-      model: draft.model ?? "",
-      schedule: draft.schedule ?? "",
-      enabled: draft.enabled,
-    });
-    await automationsQuery.refetch();
+    try {
+      await saveMutation.mutateAsync({
+        factoryId,
+        automationId: draft.id,
+        name: draft.name,
+        prompt: draft.prompt ?? draft.body ?? "",
+        model: draft.model ?? "",
+        schedule: draft.schedule ?? "",
+        enabled: draft.enabled,
+      });
+      await automationsQuery.refetch();
+      toast.success(t("factoryRoute.automationSaved"));
+    } catch (error) {
+      toast.error(
+        error instanceof Error
+          ? error.message
+          : t("factoryRoute.automationSaveFailed"),
+      );
+    }
   }
 
   async function runAutomation() {
@@ -1031,27 +1047,34 @@ function AutomationsView({
                 role="tablist"
                 aria-label={t("factoryRoute.automationsTitle")}
               >
-                {automations.map((automation) => (
-                  <button
-                    key={automation.id}
-                    type="button"
-                    id={`factory-automation-tab-${automation.id}`}
-                    role="tab"
-                    aria-selected={activeAutomationId === automation.id}
-                    aria-controls="factory-automation-panel"
-                    className={`w-full cursor-pointer rounded-lg bg-muted/20 p-4 text-left transition-colors hover:bg-muted/50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring ${activeAutomationId === automation.id ? "bg-muted/60" : ""}`}
-                    onClick={() => selectAutomation(automation.id)}
-                  >
-                    <span className="block truncate text-sm font-medium">
-                      {automation.name}
-                    </span>
-                    <span className="mt-1 block truncate text-xs text-muted-foreground">
-                      {automation.enabled
-                        ? t("factoryRoute.automationEnabled")
-                        : t("factoryRoute.automationDisabled")}
-                    </span>
-                  </button>
-                ))}
+                {automations.map((automation) => {
+                  const selected = activeAutomationId === automation.id;
+                  return (
+                    <button
+                      key={automation.id}
+                      type="button"
+                      id={`factory-automation-tab-${automation.id}`}
+                      role="tab"
+                      aria-selected={selected}
+                      aria-controls="factory-automation-panel"
+                      className={`w-full cursor-pointer rounded-lg p-4 text-left transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring ${
+                        selected
+                          ? "bg-primary/10 ring-1 ring-inset ring-primary/40"
+                          : "bg-muted/20 hover:bg-muted/50"
+                      }`}
+                      onClick={() => selectAutomation(automation.id)}
+                    >
+                      <span className="block truncate text-sm font-medium">
+                        {automation.name}
+                      </span>
+                      <span className="mt-1 block truncate text-xs text-muted-foreground">
+                        {automation.enabled
+                          ? t("factoryRoute.automationEnabled")
+                          : t("factoryRoute.automationDisabled")}
+                      </span>
+                    </button>
+                  );
+                })}
               </div>
             )}
           </CardContent>
@@ -1189,8 +1212,24 @@ function AutomationsView({
                   </div>
                 </div>
                 <div className="grid gap-1.5">
-                  <Label>{t("factoryRoute.automationPrompt")}</Label>
+                  <div className="flex flex-wrap items-baseline gap-x-2 gap-y-0.5">
+                    <Label htmlFor="factory-automation-prompt">
+                      {t("factoryRoute.automationPrompt")}
+                    </Label>
+                    {draft.updatedAt ? (
+                      <span className="capitalize text-xs text-muted-foreground">
+                        {t("factoryRoute.automationLastUpdated")}{" "}
+                        <time
+                          dateTime={new Date(draft.updatedAt).toISOString()}
+                          title={formatAutomationDate(draft.updatedAt)}
+                        >
+                          {formatInboxDateTime(draft.updatedAt)}
+                        </time>
+                      </span>
+                    ) : null}
+                  </div>
                   <Textarea
+                    id="factory-automation-prompt"
                     value={draft.prompt ?? draft.body ?? ""}
                     onChange={(event) =>
                       setDraft({ ...draft, prompt: event.target.value })
@@ -1226,11 +1265,25 @@ function AutomationsView({
                             </span>
                             {run.threadId && (
                               <a
-                                className="inline-flex items-center gap-1 text-xs text-muted-foreground underline-offset-4 hover:underline"
+                                className="inline-flex items-center text-xs text-muted-foreground underline-offset-4 hover:underline"
                                 href={`/chat/${encodeURIComponent(run.threadId)}`}
+                                onClick={(event) => {
+                                  if (
+                                    event.metaKey ||
+                                    event.ctrlKey ||
+                                    event.shiftKey ||
+                                    event.altKey ||
+                                    event.button !== 0
+                                  ) {
+                                    return;
+                                  }
+                                  event.preventDefault();
+                                  requestAgentChatThreadOpen({
+                                    threadId: run.threadId!,
+                                  });
+                                }}
                               >
                                 {t("factoryRoute.automationOpenThread")}
-                                <IconExternalLink className="size-3" />
                               </a>
                             )}
                             {run.error && (
@@ -1259,6 +1312,52 @@ function formatAutomationDate(value: string | number | null | undefined) {
   return Number.isNaN(date.getTime()) ? String(value) : date.toLocaleString();
 }
 
+function formatInboxDateTime(value: string | number | null | undefined) {
+  if (!value) return null;
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return String(value);
+  return date.toLocaleString(undefined, {
+    month: "short",
+    day: "numeric",
+    year: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+  });
+}
+
+function formatInboxAge(value: string | number | null | undefined) {
+  if (!value) return null;
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return String(value);
+
+  const elapsedSeconds = Math.max(
+    0,
+    Math.floor((Date.now() - date.getTime()) / 1_000),
+  );
+  if (elapsedSeconds < 60) return "now";
+  const elapsedMinutes = Math.floor(elapsedSeconds / 60);
+  if (elapsedMinutes < 60) return `${elapsedMinutes}m`;
+  const elapsedHours = Math.floor(elapsedMinutes / 60);
+  if (elapsedHours < 24) return `${elapsedHours}h`;
+  const elapsedDays = Math.floor(elapsedHours / 24);
+  if (elapsedDays < 30) return `${elapsedDays}d`;
+  const elapsedMonths = Math.floor(elapsedDays / 30);
+  if (elapsedMonths < 12) return `${elapsedMonths}mo`;
+  return `${Math.floor(elapsedMonths / 12)}y`;
+}
+
+const reviewListColumns =
+  "w-full gap-3 sm:grid-cols-[minmax(0,1.3fr)_minmax(4.75rem,auto)_minmax(5.5rem,auto)_minmax(4.5rem,auto)_minmax(0,1.3fr)] sm:items-start";
+
+function formatInboxSource(source: string | null | undefined) {
+  const normalized = source?.toLowerCase() ?? "";
+  if (normalized.includes("slack")) return "Slack";
+  if (normalized.includes("github")) return "GitHub";
+  if (normalized.includes("sentry")) return "Sentry";
+  const trimmed = source?.trim();
+  return trimmed ? trimmed : "Source";
+}
+
 function formatModelName(model: string | null | undefined) {
   const value = model?.trim();
   if (!value) return "the app default";
@@ -1279,6 +1378,7 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
   );
   const [feedbackNote, setFeedbackNote] = useState("");
   const [verdict, setVerdict] = useState<Verdict | null>(null);
+  const selectedRowRef = useRef<HTMLButtonElement | null>(null);
   const listQuery = useActionQuery("list-triage-items", {
     limit: 50,
     ...(status.trim()
@@ -1312,6 +1412,14 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
     setSelectedId(searchParams.get("itemId"));
   }, [searchParams]);
 
+  useEffect(() => {
+    if (!selectedId) return;
+    selectedRowRef.current?.scrollIntoView({
+      block: "nearest",
+      inline: "nearest",
+    });
+  }, [selectedId, normalizedItems.length]);
+
   function selectItem(itemId: string) {
     setSelectedId(itemId);
     setVerdict(null);
@@ -1371,19 +1479,51 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
             </p>
           ) : (
             <div className="grid gap-1.5 p-2">
+              <div
+                className={`hidden px-4 py-2 text-[11px] uppercase tracking-wide text-muted-foreground sm:grid ${reviewListColumns}`}
+              >
+                <span />
+                <span>{t("triage.risk")}</span>
+                <span>{t("triage.status")}</span>
+                <span>{t("triage.updatedAt")}</span>
+                <span>{t("triage.reason")}</span>
+              </div>
               {normalizedItems.map((item) => {
                 const id = item.itemId ?? item.id ?? "";
+                const selected = selectedId === id;
+                const createdAtLabel = formatInboxDateTime(item.createdAt);
+                const updatedAge = formatInboxAge(item.updatedAt);
                 return (
                   <button
                     key={id}
+                    ref={selected ? selectedRowRef : undefined}
                     type="button"
-                    className={`grid w-full gap-3 rounded-lg bg-muted/20 p-4 text-left transition-colors hover:bg-muted/50 sm:grid-cols-[1.1fr_.7fr_.9fr_1.6fr] ${selectedId === id ? "bg-muted/60" : ""}`}
+                    aria-current={selected ? "true" : undefined}
+                    className={`grid rounded-lg px-4 py-3 text-left transition-colors ${reviewListColumns} ${
+                      selected
+                        ? "bg-primary/10 ring-1 ring-inset ring-primary/40"
+                        : "bg-muted/20 hover:bg-muted/50"
+                    }`}
                     onClick={() => selectItem(id)}
                   >
                     <span className="min-w-0">
+                      <span className="block text-[11px] uppercase tracking-wide text-muted-foreground">
+                        {formatInboxSource(item.source ?? item.sourceName)}
+                      </span>
                       <span className="block truncate text-sm font-medium">
-                        {item.sourceName ?? item.source ?? "Unknown source"}
+                        {item.title?.trim() ||
+                          item.sourceName ||
+                          item.source ||
+                          "Untitled"}
                       </span>
+                      {createdAtLabel && item.createdAt && (
+                        <time
+                          className="mt-0.5 block text-xs text-muted-foreground"
+                          dateTime={item.createdAt}
+                        >
+                          {createdAtLabel}
+                        </time>
+                      )}
                       {item.sourceUrl && (
                         <span className="mt-1 flex max-w-full items-center gap-1 truncate text-xs text-primary">
                           {item.sourceUrl}
@@ -1392,20 +1532,36 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
                       )}
                     </span>
                     <span>
-                      <span className="block text-[11px] uppercase tracking-wide text-muted-foreground">
-                        Risk
+                      <span className="mb-1 block text-[11px] uppercase tracking-wide text-muted-foreground sm:hidden">
+                        {t("triage.risk")}
                       </span>
                       <TriageStatusPill status={item.risk} />
                     </span>
                     <span>
-                      <span className="block text-[11px] uppercase tracking-wide text-muted-foreground">
-                        Status
+                      <span className="mb-1 block text-[11px] uppercase tracking-wide text-muted-foreground sm:hidden">
+                        {t("triage.status")}
                       </span>
                       <TriageStatusPill status={item.status} />
                     </span>
-                    <span className="truncate">
-                      <span className="block text-[11px] uppercase tracking-wide text-muted-foreground">
-                        Reason
+                    <span>
+                      <span className="mb-1 block text-[11px] uppercase tracking-wide text-muted-foreground sm:hidden">
+                        {t("triage.updatedAt")}
+                      </span>
+                      {updatedAge && item.updatedAt ? (
+                        <time
+                          className="text-sm tabular-nums text-muted-foreground"
+                          dateTime={item.updatedAt}
+                          title={formatAutomationDate(item.updatedAt)}
+                        >
+                          {updatedAge}
+                        </time>
+                      ) : (
+                        <span className="text-sm text-muted-foreground">-</span>
+                      )}
+                    </span>
+                    <span className="min-w-0 truncate">
+                      <span className="mb-1 block text-[11px] uppercase tracking-wide text-muted-foreground sm:hidden">
+                        {t("triage.reason")}
                       </span>
                       <span className="text-sm">
                         {item.reason ?? item.decisionSummary ?? "-"}
@@ -1431,8 +1587,15 @@ function InboxView({ t }: { t: ReturnType<typeof useT> }) {
             <>
               <div className="flex items-start justify-between gap-3">
                 <div>
+                  <p className="text-[11px] uppercase tracking-wide text-muted-foreground">
+                    {formatInboxSource(
+                      selectedItem.source ?? selectedItem.sourceName,
+                    )}
+                  </p>
                   <p className="text-sm font-medium">
-                    {selectedItem.sourceName ?? selectedItem.source}
+                    {selectedItem.title?.trim() ||
+                      selectedItem.sourceName ||
+                      selectedItem.source}
                   </p>
                   {selectedItem.sourceUrl && (
                     <a

package/corpus/templates/factory/server/connectors/slack.ts

@@ -1,3 +1,5 @@
+import { createHash } from "node:crypto";
+
 export type Workspace = "primary" | "secondary";
 
 export type SlackTokenResolver = (workspace: Workspace) => Promise<string>;
@@ -20,6 +22,12 @@ export interface SlackTeamInfo {
   domain: string;
 }
 
+export interface SlackUserInfo {
+  id: string;
+  name: string | null;
+  displayName: string | null;
+}
+
 export interface ChannelHistoryResult {
   messages: SlackMessage[];
   has_more: boolean;
@@ -65,16 +73,20 @@ async function getToken(
   );
 }
 
+function slackCacheScope(token: string): string {
+  return createHash("sha256").update(token).digest("hex").slice(0, 16);
+}
+
 async function slackApi<T>(
   workspace: Workspace,
   method: string,
   params: Record<string, string> | undefined,
   tokenResolver?: SlackTokenResolver,
 ): Promise<T> {
-  const cacheKey = `${workspace}:${method}:${JSON.stringify(params ?? {})}`;
+  const token = await getToken(workspace, tokenResolver);
+  const cacheKey = `${workspace}:${slackCacheScope(token)}:${method}:${JSON.stringify(params ?? {})}`;
   const cached = cache.get(cacheKey);
   if (cached && cached.expiresAt > Date.now()) return cached.value as T;
-  const token = await getToken(workspace, tokenResolver);
   const url = new URL(`https://slack.com/api/${method}`);
   for (const [key, value] of Object.entries(params ?? {}))
     url.searchParams.set(key, value);
@@ -255,3 +267,33 @@ export async function getTeamInfo(
   );
   return data.team ?? { id: data.team_id ?? "", name: workspace, domain: "" };
 }
+
+export async function getUserInfo(
+  workspace: Workspace,
+  userId: string,
+  tokenResolver?: SlackTokenResolver,
+): Promise<SlackUserInfo> {
+  const id = userId.trim();
+  if (!id) throw new Error("A Slack user id is required.");
+  const data = await slackApi<{
+    user?: {
+      id?: string;
+      name?: string;
+      profile?: { display_name?: string };
+    };
+  }>(workspace, "users.info", { user: id }, tokenResolver);
+  const user = data.user;
+  if (!user || typeof user.id !== "string" || !user.id.trim()) {
+    throw new Error("Slack user response is missing a user id.");
+  }
+  const displayName =
+    typeof user.profile?.display_name === "string"
+      ? user.profile.display_name.trim()
+      : "";
+  const name = typeof user.name === "string" ? user.name.trim() : "";
+  return {
+    id: user.id.trim(),
+    name: name || null,
+    displayName: displayName || null,
+  };
+}

package/corpus/templates/factory/server/plugins/agent-chat.ts

@@ -89,13 +89,15 @@ Builder, auto-approve, or auto-merge those items. Slack clear bugs use the
 thread-preserving start-builder-for-item flow; GitHub and Sentry clear bugs use
 the Builder agent-run flow. Slack repeat reports must be clustered by underlying
 symptom, with one Builder thread for the cluster and 👀 on every grouped report.
-Use /address-feedback for the repository feedback workflow. For pull requests,
-follow review-prs: read the complete diff and review evidence, verify current
-BuilderIO membership, preserve the ultra-scary safety gate, and distinguish
-unknown or unresolved checks from clean ones. Auto-merge also requires a
-verified Factory Builder run. When a user says to do a review-gated item now,
-use the explicit approval action, which records the approver and applies the
-rule's configured executor policy. Keep Slack replies concise and link to the
+After classifying an item, call start-builder-for-item with clearBug true or
+false and a short reason so a skip is recorded. Use /address-feedback for the
+repository feedback workflow. For pull requests, follow review-prs: read the
+complete diff and review evidence, verify current BuilderIO membership, preserve
+the ultra-scary safety gate, and distinguish unknown or unresolved checks from
+clean ones. Auto-merge also requires a verified Factory Builder run. When a user
+says to do a review-gated item now, use the explicit approval action, which
+records the approver and applies the rule's configured executor policy. Keep
+Slack replies concise and link to the
 Factory item when a review is needed. The scheduled builder-io-bot PR babysitter
 posts its exact feedback-fix request through GitHub, persists a 20-minute quiet
 window, and never approves or merges.`,

package/corpus/templates/factory/server/plugins/factory-scheduler-job.ts

@@ -169,6 +169,8 @@ const FACTORY_DEFAULT_MODEL =
   process.env.FACTORY_AUTOMATION_MODEL?.trim() || "gpt-5.6-luna";
 const FACTORY_DEFAULT_MAX_ITERATIONS = 32;
 const FACTORY_DEFAULT_MAX_RUN_INPUT_TOKENS = 1_000_000;
+const SKIP_RECORD_GUARD =
+  "After classifying each processed item, call start-builder-for-item with clearBug true or false and a short evidence-grounded reason so the skip or dispatch is recorded.";
 
 const AUTOMATION_SEEDS: AutomationSeed[] = [
   {
@@ -224,6 +226,7 @@ the representative source, every related source, and the need to fix the
 underlying boundary across the whole cluster. Never add the reaction or tag
 Builder for owner-managed Clips, Design, or Content work, or for a non-bug
 report.
+After classifying each processed item, call start-builder-for-item with clearBug true or false and a short evidence-grounded reason so the skip or dispatch is recorded.
 
 Keep each run bounded. Preserve action errors and do not claim a Builder reply,
 PR, merge, or fix unless an action returned that state.
@@ -254,6 +257,7 @@ For each eligible clear bug, call start-builder-for-item with clearBug true,
 an evidence-grounded reason, and clearErrorReport containing only the bounded
 Sentry evidence. Builder should open a PR; do not claim it did so until the
 run callback or PR observation confirms it.
+After classifying each processed item, call start-builder-for-item with clearBug true or false and a short evidence-grounded reason so the skip or dispatch is recorded.
 `,
   },
   {
@@ -281,6 +285,7 @@ For each eligible item call start-builder-for-item with clearBug true,
 evidence-grounded reason, and the bounded issue body as clearErrorReport.
 Preserve failures and never report a successful Builder run without its action
 confirmation.
+After classifying each processed item, call start-builder-for-item with clearBug true or false and a short evidence-grounded reason so the skip or dispatch is recorded.
 `,
   },
   {
@@ -522,6 +527,14 @@ async function ensureOrganizationAutomations(
       if (promptGuard && !repaired.includes(promptGuard)) {
         repaired = `${repaired.trimEnd()}\n\n${promptGuard}\n`;
       }
+      if (
+        (seed.name === "factory-slack-feedback" ||
+          seed.name === "factory-sentry-errors" ||
+          seed.name === "factory-github-issues") &&
+        !repaired.includes(SKIP_RECORD_GUARD)
+      ) {
+        repaired = `${repaired.trimEnd()}\n\n${SKIP_RECORD_GUARD}\n`;
+      }
       if (repaired === existing.content) return;
 
       const updated = await resourcePutIfCurrent({

package/corpus/templates/factory/server/triage/slack-client.ts

@@ -4,11 +4,13 @@ import {
   addEyesReaction as writeEyesReaction,
   getThread as readThread,
   getTeamInfo as readTeamInfo,
+  getUserInfo as readUserInfo,
   postThreadReply as writeThreadReply,
   type ChannelHistoryResult,
   type SlackPostMessageResult,
   type SlackReactionResult,
   type SlackTeamInfo,
+  type SlackUserInfo,
   type SlackTokenResolver,
   type ThreadRepliesResult,
   type Workspace,
@@ -57,6 +59,9 @@ export function createSlackReader(identity: SlackReaderIdentity) {
     getTeamInfo(workspace: Workspace): Promise<SlackTeamInfo> {
       return readTeamInfo(workspace, tokenResolver);
     },
+    getUserInfo(workspace: Workspace, userId: string): Promise<SlackUserInfo> {
+      return readUserInfo(workspace, userId, tokenResolver);
+    },
     getThread(
       workspace: Workspace,
       channelId: string,

package/corpus/templates/factory/server/triage/slack-poller.ts

@@ -5,6 +5,7 @@ import { createSlackReader } from "./slack-client";
 const SLACK_HISTORY_LIMIT = 100;
 const MAX_HISTORY_PAGES = 5;
 const MAX_SUMMARY_LENGTH = 500;
+export const SLACK_USER_INFO_CONCURRENCY = 4;
 
 export interface SlackPollInput {
   workspace: Workspace;
@@ -37,17 +38,75 @@ function compactText(text: string): string {
     : compact;
 }
 
-function messageLabel(message: SlackMessage): string {
+function messageLabel(message: SlackMessage, resolvedLabel?: string): string {
   if (message.bot_id || message.username) {
     return `Slack bot ${message.username ?? message.bot_id ?? "unknown"}`;
   }
-  return `Slack user ${message.user ?? "unknown"}`;
+  return `Slack user ${resolvedLabel ?? message.user ?? "unknown"}`;
+}
+
+function slackUserLabel(
+  user: { name: string | null; displayName: string | null } | null,
+  userId: string,
+): string {
+  const displayName = user?.displayName?.trim();
+  if (displayName) return displayName;
+  const name = user?.name?.trim();
+  if (name) return name.startsWith("@") ? name : `@${name}`;
+  return userId;
+}
+
+async function resolveUserLabels(
+  slack: ReturnType<typeof createSlackReader>,
+  workspace: Workspace,
+  messages: SlackMessage[],
+): Promise<Map<string, string>> {
+  const userIds = [
+    ...new Set(
+      messages
+        .filter((message) => !message.bot_id && !message.username)
+        .map((message) => message.user?.trim())
+        .filter((userId): userId is string => Boolean(userId)),
+    ),
+  ];
+  const labels = new Map<string, string>();
+  await mapWithConcurrency(
+    userIds,
+    SLACK_USER_INFO_CONCURRENCY,
+    async (userId) => {
+      try {
+        const user = await slack.getUserInfo(workspace, userId);
+        labels.set(userId, slackUserLabel(user, userId));
+      } catch {
+        labels.set(userId, userId);
+      }
+    },
+  );
+  return labels;
+}
+
+async function mapWithConcurrency<T>(
+  values: T[],
+  concurrency: number,
+  mapper: (value: T) => Promise<void>,
+): Promise<void> {
+  let nextIndex = 0;
+  const worker = async () => {
+    while (nextIndex < values.length) {
+      const index = nextIndex++;
+      await mapper(values[index]!);
+    }
+  };
+  await Promise.all(
+    Array.from({ length: Math.min(concurrency, values.length) }, worker),
+  );
 }
 
 function toEnvelope(
   channelId: string,
   message: SlackMessage,
   teamDomain?: string,
+  userLabels?: Map<string, string>,
 ): IngestionEnvelope {
   const threadTs = message.thread_ts ?? message.ts;
   const suppliedPermalink = (message as SlackMessage & { permalink?: string })
@@ -63,7 +122,10 @@ function toEnvelope(
     externalId: `${channelId}:${threadTs}`,
     receivedAt: new Date().toISOString(),
     ...(sourceUrl ? { sourceUrl } : {}),
-    title: messageLabel(message),
+    title: messageLabel(
+      message,
+      message.user ? userLabels?.get(message.user) : undefined,
+    ),
     summary: compactText(message.text),
     channelId,
     threadTs,
@@ -149,9 +211,15 @@ export async function pollSlackChannel({
     { value: priorTs, raw: priorLastSlackTs },
   );
 
+  const userLabels = await resolveUserLabels(
+    slack,
+    workspace,
+    uniqueNewMessages.map(({ message }) => message),
+  );
+
   return {
     envelopes: uniqueNewMessages.map(({ message }) =>
-      toEnvelope(channelId, message, teamDomain),
+      toEnvelope(channelId, message, teamDomain, userLabels),
     ),
     nextLastSlackTs: maxSeen.raw,
     nextHistoryCursor,