chore: merge origin/main into mintlify/af82bda4 and resolve conflicts

integrations/openclaw/skill-loader.ts

@@ -346,12 +346,12 @@ export function loadSkill(
   }
 
   // Inject triage knobs (importanceThreshold, credentialPatterns)
-  if (skillName === "memory-triage" || skillName === "memory-dream") {
+  if (skillName === "memory-triage") {
     const knobs = renderTriageKnobs(config);
     if (knobs) parts.push(knobs);
   }
 
-  // Append user custom rules (triage-only — extraction rules don't apply to recall/dream)
+  // Append user custom rules to the triage prompt.
   if (skillName === "memory-triage" && config.customRules) {
     const rulesBlock: string[] = ["\n## User Custom Rules\n"];
     if (config.customRules.include?.length) {
@@ -659,15 +659,6 @@ export function loadCompactTriagePrompt(config: SkillsConfig = {}): string {
   return parts.join("\n");
 }
 
-/**
- * Load the dream skill prompt for consolidation sessions.
- */
-export function loadDreamPrompt(config: SkillsConfig = {}): string {
-  const dream = loadSkill("memory-dream", config);
-  if (!dream) return "";
-  return dream.prompt;
-}
-
 /**
  * Resolve the effective categories — user overrides merged with defaults.
  */