From 3fcd6fadf36f20e63ad8c98901cb0d607535b959 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 17 Jan 2026 03:25:05 +0000
Subject: [PATCH] fix: land oxlint config follow-ups (#1064) (thanks
 @connorshea)

---
 CHANGELOG.md                                | 1 +
 src/agents/tools/message-tool.ts            | 2 +-
 src/auto-reply/reply/get-reply.ts           | 1 +
 src/infra/outbound/message-action-runner.ts | 6 +++---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 527c637f4..b0c9ca8f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 
 ### Fixes
 - Sub-agents: route announce delivery through the correct channel account IDs. (#1061, #1058) — thanks @adam91holt.
+- Repo: fix oxlint config filename and move ignore pattern into config. (#1064) — thanks @connorshea.
 - Messages: `/stop` now hard-aborts queued followups and sub-agent runs; suppress zero-count stop notes.
 - Sessions: reset `compactionCount` on `/new` and `/reset`, and preserve `sessions.json` file mode (0600).
 - Sessions: repair orphaned user turns before embedded prompts.
diff --git a/src/agents/tools/message-tool.ts b/src/agents/tools/message-tool.ts
index bf7e937aa..94a48d466 100644
--- a/src/agents/tools/message-tool.ts
+++ b/src/agents/tools/message-tool.ts
@@ -227,7 +227,7 @@ export function createMessageTool(options?: MessageToolOptions): AnyAgentTool {
         }
       }
 
-      if (result.toolResult) return result.toolResult;
+      if ("toolResult" in result && result.toolResult) return result.toolResult;
       return jsonResult(result.payload);
     },
   };
diff --git a/src/auto-reply/reply/get-reply.ts b/src/auto-reply/reply/get-reply.ts
index 614c34504..11b0c7e5b 100644
--- a/src/auto-reply/reply/get-reply.ts
+++ b/src/auto-reply/reply/get-reply.ts
@@ -100,6 +100,7 @@ export async function getReplyFromConfig(
   let {
     sessionCtx,
     sessionEntry,
+    previousSessionEntry,
     sessionStore,
     sessionKey,
     sessionId,
diff --git a/src/infra/outbound/message-action-runner.ts b/src/infra/outbound/message-action-runner.ts
index 93f375db1..ba4e52113 100644
--- a/src/infra/outbound/message-action-runner.ts
+++ b/src/infra/outbound/message-action-runner.ts
@@ -445,9 +445,9 @@ export async function runMessageAction(
         : null;
     const useTextMarker = !(channel === "discord" && marker?.discordEmbeds?.length);
     if (useTextMarker && (marker?.prefix || marker?.suffix)) {
-      const base = params.message ?? "";
-      params.message = `${marker?.prefix ?? ""}${base}${marker?.suffix ?? ""}`;
-      message = params.message;
+      const merged = `${marker?.prefix ?? ""}${message}${marker?.suffix ?? ""}`;
+      params.message = merged;
+      message = merged;
     }
 
     const mediaUrl = readStringParam(params, "media", { trim: false });