fix: land oxlint config follow-ups (#1064) (thanks @connorshea)

This commit is contained in:
Peter Steinberger
2026-01-17 03:25:05 +00:00
parent 78136c4368
commit 3fcd6fadf3
4 changed files with 6 additions and 4 deletions

View File

@@ -30,6 +30,7 @@
### Fixes ### Fixes
- Sub-agents: route announce delivery through the correct channel account IDs. (#1061, #1058) — thanks @adam91holt. - 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. - 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: reset `compactionCount` on `/new` and `/reset`, and preserve `sessions.json` file mode (0600).
- Sessions: repair orphaned user turns before embedded prompts. - Sessions: repair orphaned user turns before embedded prompts.

View File

@@ -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); return jsonResult(result.payload);
}, },
}; };

View File

@@ -100,6 +100,7 @@ export async function getReplyFromConfig(
let { let {
sessionCtx, sessionCtx,
sessionEntry, sessionEntry,
previousSessionEntry,
sessionStore, sessionStore,
sessionKey, sessionKey,
sessionId, sessionId,

View File

@@ -445,9 +445,9 @@ export async function runMessageAction(
: null; : null;
const useTextMarker = !(channel === "discord" && marker?.discordEmbeds?.length); const useTextMarker = !(channel === "discord" && marker?.discordEmbeds?.length);
if (useTextMarker && (marker?.prefix || marker?.suffix)) { if (useTextMarker && (marker?.prefix || marker?.suffix)) {
const base = params.message ?? ""; const merged = `${marker?.prefix ?? ""}${message}${marker?.suffix ?? ""}`;
params.message = `${marker?.prefix ?? ""}${base}${marker?.suffix ?? ""}`; params.message = merged;
message = params.message; message = merged;
} }
const mediaUrl = readStringParam(params, "media", { trim: false }); const mediaUrl = readStringParam(params, "media", { trim: false });