fix(slack): centralize timestamp parsing

steipete · steipete · commit d7e24e024fc6 · 2026-05-29T08:48:22.000-04:00
diff --git a/extensions/slack/src/monitor/message-handler/prepare-dm-history.ts b/extensions/slack/src/monitor/message-handler/prepare-dm-history.ts
@@ -4,6 +4,7 @@ import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import type { ResolvedSlackAccount } from "../../accounts.js";
 import type { SlackMonitorContext } from "../context.js";
+import { resolveSlackTimestampMs } from "./timestamp.js";
 
 type SlackDmHistoryMessage = {
   text?: string;
@@ -19,17 +20,6 @@ type SlackDmHistoryEntry = {
   timestamp?: number;
 };
 
-const SLACK_TIMESTAMP_RE = /^\d+(?:\.\d+)?$/;
-
-function resolveSlackTimestampMs(ts: string | undefined): number | undefined {
-  const trimmed = ts?.trim();
-  if (!trimmed || !SLACK_TIMESTAMP_RE.test(trimmed)) {
-    return undefined;
-  }
-  const parsed = Number(trimmed);
-  return Number.isFinite(parsed) ? Math.round(parsed * 1000) : undefined;
-}
-
 export function resolveSlackDmHistoryLimit(params: {
   account: ResolvedSlackAccount;
   userId?: string;
diff --git a/extensions/slack/src/monitor/message-handler/prepare-thread-context.test.ts b/extensions/slack/src/monitor/message-handler/prepare-thread-context.test.ts
@@ -293,6 +293,27 @@ describe("resolveSlackThreadContextData", () => {
     expect(result.threadHistoryBody).not.toContain("Unknown (user)");
   });
 
+  it("does not coerce malformed thread history timestamps into event times", async () => {
+    const { result } = await resolveAllowlistedThreadContext({
+      repliesMessages: [
+        { text: "starter from Alice", user: "U1", ts: "100.000" },
+        { text: "malformed timestamp follow-up", user: "U1", ts: "0x65" },
+        { text: "current message", user: "U1", ts: "101.000" },
+      ],
+      threadStarter: {
+        text: "starter from Alice",
+        userId: "U1",
+        ts: "100.000",
+      },
+      allowFromLower: ["u1"],
+      allowNameMatching: false,
+    });
+
+    expect(result.threadHistoryBody).toContain("malformed timestamp follow-up");
+    expect(result.threadHistoryBody).toContain("[slack message id: 0x65 channel: C123]");
+    expect(result.threadHistoryBody).not.toContain("1970-01-01");
+  });
+
   it("includes self-authored starter (identified by bot user id) for a new thread session (default)", async () => {
     const { result } = await resolveAllowlistedThreadContext({
       repliesMessages: [
diff --git a/extensions/slack/src/monitor/message-handler/prepare-thread-context.ts b/extensions/slack/src/monitor/message-handler/prepare-thread-context.ts
@@ -21,6 +21,7 @@ import {
   resolveSlackThreadHistoryFilterPolicy,
   shouldIncludeBotThreadStarterContext,
 } from "./prepare-thread-context-root.js";
+import { resolveSlackTimestampMs } from "./timestamp.js";
 
 type SlackMediaModule = typeof import("../media.js");
 let slackMediaModulePromise: Promise<SlackMediaModule> | undefined;
@@ -310,7 +311,7 @@ export async function resolveSlackThreadContextData(params: {
           formatInboundEnvelope({
             channel: "Slack",
             from: `${msgSenderName} (${role})`,
-            timestamp: historyMsg.ts ? Math.round(Number(historyMsg.ts) * 1000) : undefined,
+            timestamp: resolveSlackTimestampMs(historyMsg.ts),
             body: msgWithId,
             chatType: "channel",
             envelope: params.envelopeOptions,
diff --git a/extensions/slack/src/monitor/message-handler/prepare.ts b/extensions/slack/src/monitor/message-handler/prepare.ts
@@ -72,6 +72,7 @@ import { resolveSlackDmHistoryContext, resolveSlackDmHistoryLimit } from "./prep
 import { resolveSlackRoutingContext } from "./prepare-routing.js";
 import { resolveSlackThreadContextData } from "./prepare-thread-context.js";
 import { isSlackSubteamMentionForBot, normalizeSlackId } from "./subteam-mentions.js";
+import { resolveSlackTimestampMs } from "./timestamp.js";
 import type { PreparedSlackMessage } from "./types.js";
 
 const mentionRegexCache = new WeakMap<SlackMonitorContext, Map<string, RegExp[]>>();
@@ -83,7 +84,6 @@ const SLACK_HISTORY_MEDIA_MAX_ATTACHMENTS = 4;
 const SLACK_HISTORY_MEDIA_MAX_BYTES = 10 * 1024 * 1024;
 const SLACK_HISTORY_MEDIA_IDLE_TIMEOUT_MS = 1_000;
 const SLACK_HISTORY_MEDIA_TOTAL_TIMEOUT_MS = 3_000;
-const SLACK_TIMESTAMP_RE = /^\d+(?:\.\d+)?$/;
 
 function recordString(
   record: Record<string, unknown> | undefined,
@@ -105,15 +105,6 @@ function recordNullableString(
   return normalizeOptionalString(record[key]);
 }
 
-function resolveSlackTimestampMs(ts: string | undefined): number | undefined {
-  const trimmed = ts?.trim();
-  if (!trimmed || !SLACK_TIMESTAMP_RE.test(trimmed)) {
-    return undefined;
-  }
-  const parsed = Number(trimmed);
-  return Number.isFinite(parsed) ? Math.round(parsed * 1000) : undefined;
-}
-
 function mergeSlackAssistantThreadContext(
   primary: Omit<SlackAssistantThreadContext, "updatedAt"> | undefined,
   fallback: Omit<SlackAssistantThreadContext, "updatedAt"> | undefined,
diff --git a/extensions/slack/src/monitor/message-handler/timestamp.ts b/extensions/slack/src/monitor/message-handler/timestamp.ts
@@ -0,0 +1,10 @@
+const SLACK_TIMESTAMP_RE = /^\d+(?:\.\d+)?$/;
+
+export function resolveSlackTimestampMs(ts: string | undefined): number | undefined {
+  const trimmed = ts?.trim();
+  if (!trimmed || !SLACK_TIMESTAMP_RE.test(trimmed)) {
+    return undefined;
+  }
+  const parsed = Number(trimmed);
+  return Number.isFinite(parsed) ? Math.round(parsed * 1000) : undefined;
+}
