Merge branch 'dev'

This commit is contained in:
youzini
2026-06-01 06:49:26 +00:00
2 changed files with 1 additions and 58 deletions

View File

@@ -611,26 +611,6 @@ export async function onGenerationAfterCommandsController(
return;
}
if (globalThis.__stBmeDebugLoggingEnabled === true) {
const tail = Array.isArray(chat)
? chat.slice(-3).map((m, i) => ({
idx: chat.length - 3 + i,
is_user: Boolean(m?.is_user),
hasRecall: Boolean(m?.extra?.bme_recall),
mes: String(m?.mes || "").slice(0, 40),
}))
: null;
console.warn("[ST-BME][reroll-trace] AFTER_COMMANDS enter", {
type,
generationContextType: generationContext?.type || null,
generationContextKind: generationContext?.kind || null,
recallOptionsSource: recallOptions?.overrideSource || recallOptions?.source || null,
recallOptionsType: recallOptions?.generationType || null,
targetUserMessageIndex: recallOptions?.targetUserMessageIndex ?? null,
chatTail: tail,
});
}
const recallContext = runtime.createGenerationRecallContext({
hookName: "GENERATION_AFTER_COMMANDS",
generationType,

View File

@@ -1,6 +1,6 @@
// ST-BME: 召回输入解析与注入控制器(纯函数)
import { debugLog, debugWarn } from "../runtime/debug-logging.js";
import { debugLog } from "../runtime/debug-logging.js";
import { isSystemMessageForExtraction } from "../maintenance/chat-history.js";
export function buildRecallRecentMessagesController(
@@ -162,12 +162,6 @@ function resolveReusablePersistedRecallRecord(chat, recallInput, runtime) {
}
if (!Number.isFinite(targetUserMessageIndex)) {
debugWarn("[ST-BME][reroll-trace] no target user floor resolved", {
generationType,
recallSource,
currentRecallInputText: currentRecallInputText.slice(0, 60),
chatLength: Array.isArray(chat) ? chat.length : null,
});
return null;
}
@@ -176,12 +170,6 @@ function resolveReusablePersistedRecallRecord(chat, recallInput, runtime) {
const record = readPersistedRecallFromUserMessage(chat, targetUserMessageIndex);
if (!record?.injectionText) {
debugWarn("[ST-BME][reroll-trace] target floor has no persisted recall record", {
generationType,
recallSource,
targetUserMessageIndex,
targetUserFloorText: String(targetMessage?.mes || "").slice(0, 60),
});
return null;
}
@@ -244,34 +232,9 @@ function resolveReusablePersistedRecallRecord(chat, recallInput, runtime) {
!canReuseUnboundTargetRecord &&
!canTrustUserFloorRecord
) {
debugWarn("[ST-BME][reroll-trace] reuse REJECTED", {
generationType,
recallSource,
targetUserMessageIndex,
isActiveInputSource,
isNoNewUserGeneration,
hasRecord: Boolean(record?.injectionText),
currentUserFloorText: currentUserFloorText.slice(0, 60),
currentRecallInputText: currentRecallInputText.slice(0, 60),
recordRecallInput: recordRecallInput.slice(0, 60),
boundUserFloorText: boundUserFloorText.slice(0, 60),
matchesPersistedRecord,
canReuseUnboundTargetRecord,
canTrustUserFloorRecord,
recordRecallInputMismatch,
});
return null;
}
debugWarn("[ST-BME][reroll-trace] reuse ACCEPTED", {
generationType,
recallSource,
targetUserMessageIndex,
matchesPersistedRecord,
canReuseUnboundTargetRecord,
canTrustUserFloorRecord,
});
return {
record,
targetUserMessageIndex,