refactor: controllerize generation recall event hooks

event-binding.js

@@ -167,3 +167,81 @@ export function onMessageSwipedController(runtime, messageId, meta = null) {
   runtime.invalidateRecallAfterHistoryMutation("已切换楼层 swipe");
   runtime.scheduleHistoryMutationRecheck("message-swiped", messageId, meta);
 }
+
+export async function onGenerationAfterCommandsController(
+  runtime,
+  type,
+  params = {},
+  dryRun = false,
+) {
+  if (dryRun) return;
+
+  const context = runtime.getContext();
+  const chat = context?.chat;
+  const recallOptions = runtime.buildGenerationAfterCommandsRecallInput(
+    type,
+    params,
+    chat,
+  );
+  if (!recallOptions?.overrideUserMessage) return;
+
+  const recallContext = runtime.createGenerationRecallContext({
+    hookName: "GENERATION_AFTER_COMMANDS",
+    generationType: String(type || "normal").trim() || "normal",
+    recallOptions,
+  });
+  if (!recallContext.shouldRun) {
+    return;
+  }
+
+  runtime.markGenerationRecallTransactionHookState(
+    recallContext.transaction,
+    recallContext.hookName,
+    "running",
+  );
+  const recallResult = await runtime.runRecall({
+    ...recallOptions,
+    recallKey: recallContext.recallKey,
+    hookName: recallContext.hookName,
+    signal: params?.signal,
+  });
+
+  runtime.markGenerationRecallTransactionHookState(
+    recallContext.transaction,
+    recallContext.hookName,
+    runtime.getGenerationRecallHookStateFromResult(recallResult),
+  );
+}
+
+export async function onBeforeCombinePromptsController(runtime) {
+  const context = runtime.getContext();
+  const chat = context?.chat;
+  const recallOptions =
+    runtime.buildNormalGenerationRecallInput(chat) ||
+    runtime.buildHistoryGenerationRecallInput(chat) ||
+    {};
+  const recallContext = runtime.createGenerationRecallContext({
+    hookName: "GENERATE_BEFORE_COMBINE_PROMPTS",
+    generationType: "normal",
+    recallOptions,
+  });
+  if (!recallContext.shouldRun) {
+    return;
+  }
+
+  runtime.markGenerationRecallTransactionHookState(
+    recallContext.transaction,
+    recallContext.hookName,
+    "running",
+  );
+  const recallResult = await runtime.runRecall({
+    ...recallOptions,
+    recallKey: recallContext.recallKey,
+    hookName: recallContext.hookName,
+  });
+  runtime.markGenerationRecallTransactionHookState(
+    recallContext.transaction,
+    recallContext.hookName,
+    runtime.getGenerationRecallHookStateFromResult(recallResult),
+  );
+}

index.js

@@ -60,6 +60,8 @@ import {
   installSendIntentHooksController,
   onChatChangedController,
   onChatLoadedController,
+  onBeforeCombinePromptsController,
+  onGenerationAfterCommandsController,
   onMessageDeletedController,
   onMessageEditedController,
   onMessageSentController,
@@ -4409,76 +4411,31 @@ function onMessageSwiped(messageId, meta = null) {
 }
 
 async function onGenerationAfterCommands(type, params = {}, dryRun = false) {
-  if (dryRun) return;
+  return await onGenerationAfterCommandsController(
-
+    {
-  const context = getContext();
+      buildGenerationAfterCommandsRecallInput,
-  const chat = context?.chat;
+      createGenerationRecallContext,
-  const recallOptions = buildGenerationAfterCommandsRecallInput(
+      getContext,
+      getGenerationRecallHookStateFromResult,
+      markGenerationRecallTransactionHookState,
+      runRecall,
+    },
     type,
     params,
-    chat,
+    dryRun,
-  );
-  if (!recallOptions?.overrideUserMessage) return;
-
-  const recallContext = createGenerationRecallContext({
-    hookName: "GENERATION_AFTER_COMMANDS",
-    generationType: String(type || "normal").trim() || "normal",
-    recallOptions,
-  });
-  if (!recallContext.shouldRun) {
-    return;
-  }
-
-  markGenerationRecallTransactionHookState(
-    recallContext.transaction,
-    recallContext.hookName,
-    "running",
-  );
-  const recallResult = await runRecall({
-    ...recallOptions,
-    recallKey: recallContext.recallKey,
-    hookName: recallContext.hookName,
-    signal: params?.signal,
-  });
-
-  markGenerationRecallTransactionHookState(
-    recallContext.transaction,
-    recallContext.hookName,
-    getGenerationRecallHookStateFromResult(recallResult),
   );
 }
 
 async function onBeforeCombinePrompts() {
-  const context = getContext();
+  return await onBeforeCombinePromptsController({
-  const chat = context?.chat;
+    buildHistoryGenerationRecallInput,
-  const recallOptions =
+    buildNormalGenerationRecallInput,
-    buildNormalGenerationRecallInput(chat) ||
+    createGenerationRecallContext,
-    buildHistoryGenerationRecallInput(chat) ||
+    getContext,
-    {};
+    getGenerationRecallHookStateFromResult,
-  const recallContext = createGenerationRecallContext({
+    markGenerationRecallTransactionHookState,
-    hookName: "GENERATE_BEFORE_COMBINE_PROMPTS",
+    runRecall,
-    generationType: "normal",
-    recallOptions,
   });
-  if (!recallContext.shouldRun) {
-    return;
-  }
-
-  markGenerationRecallTransactionHookState(
-    recallContext.transaction,
-    recallContext.hookName,
-    "running",
-  );
-  const recallResult = await runRecall({
-    ...recallOptions,
-    recallKey: recallContext.recallKey,
-    hookName: recallContext.hookName,
-  });
-  markGenerationRecallTransactionHookState(
-    recallContext.transaction,
-    recallContext.hookName,
-    getGenerationRecallHookStateFromResult(recallResult),
-  );
 }
 
 function onMessageReceived() {

tests/p0-regressions.mjs

@@ -53,6 +53,10 @@ import {
   pruneProcessedMessageHashesFromFloor,
   rollbackAffectedJournals,
 } from "../chat-history.js";
+import {
+  onBeforeCombinePromptsController,
+  onGenerationAfterCommandsController,
+} from "../event-binding.js";
 
 const extensionsShimSource = [
   "export const extension_settings = globalThis.__p0ExtensionSettings || {};",
@@ -303,6 +307,8 @@ function createGenerationRecallHarness() {
       GRAPH_LOAD_STATES,
       GRAPH_METADATA_KEY,
       GRAPH_PERSISTENCE_META_KEY,
+      onBeforeCombinePromptsController,
+      onGenerationAfterCommandsController,
     };
     vm.createContext(context);
     vm.runInContext(