let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: normalize directive triggers and short-circuit

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-05 21:29:41 +00:00
parent e7a9313135
commit dc02bcee74
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/auto-reply/reply.ts
View File

@@ -200,13 +200,19 @@ export async function getReplyFromConfig(
let persistedThinking: string | undefined; let persistedThinking: string | undefined;
let persistedVerbose: string | undefined; let persistedVerbose: string | undefined;
const triggerBodyNormalized = stripStructuralPrefixes(
ctx.Body ?? "",
)
.trim()
.toLowerCase();
if (sessionCfg) { if (sessionCfg) {
const rawBody = ctx.Body ?? ""; const rawBody = ctx.Body ?? "";
const trimmedBody = rawBody.trim(); const trimmedBody = rawBody.trim();
// Timestamp/message prefixes (e.g. "[Dec 4 17:35] ") are added by the // Timestamp/message prefixes (e.g. "[Dec 4 17:35] ") are added by the
// web inbox before we get here. They prevented reset triggers like "/new" // web inbox before we get here. They prevented reset triggers like "/new"
// from matching, so strip structural wrappers when checking for resets. // from matching, so strip structural wrappers when checking for resets.
const strippedForReset = stripStructuralPrefixes(rawBody).trim(); const strippedForReset = triggerBodyNormalized;
for (const trigger of resetTriggers) { for (const trigger of resetTriggers) {
if (!trigger) continue; if (!trigger) continue;
if (trimmedBody === trigger || strippedForReset === trigger) { if (trimmedBody === trigger || strippedForReset === trigger) {
@@ -464,9 +470,7 @@ export async function getReplyFromConfig(
const to = (ctx.To ?? "").replace(/^whatsapp:/, ""); const to = (ctx.To ?? "").replace(/^whatsapp:/, "");
const isSamePhone = from && to && from === to; const isSamePhone = from && to && from === to;
const abortKey = sessionKey ?? (from || undefined) ?? (to || undefined); const abortKey = sessionKey ?? (from || undefined) ?? (to || undefined);
const rawBodyNormalized = (sessionCtx.BodyStripped ?? sessionCtx.Body ?? "") const rawBodyNormalized = triggerBodyNormalized;
.trim()
.toLowerCase();
if (!sessionEntry && abortKey) { if (!sessionEntry && abortKey) {
abortedLastRun = ABORT_MEMORY.get(abortKey) ?? false; abortedLastRun = ABORT_MEMORY.get(abortKey) ?? false;
@@ -499,8 +503,7 @@ export async function getReplyFromConfig(
} }
const abortRequested = const abortRequested =
reply?.mode === "command" && reply?.mode === "command" && isAbortTrigger(rawBodyNormalized);
isAbortTrigger((sessionCtx.BodyStripped ?? sessionCtx.Body ?? "").trim());
if (abortRequested) { if (abortRequested) {
if (sessionEntry && sessionStore && sessionKey) { if (sessionEntry && sessionStore && sessionKey) {