root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(engine): triage and heartbeat use prompt layers for caching

Browse Source
This commit is contained in:
Matthew Greenberg
2026-05-08 20:06:20 -04:00
parent 5d3531e0be
commit 9e5607b6c6
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/engine/src/agent-heartbeat.ts
View File

@@ -26,10 +26,10 @@ import { createTaskCreateTool, createTaskLogToolWithContext, createTaskDocumentW
import { AgentLogger } from "./agent-logger.js";
import {
resolveAgentInstructionsWithRatings,
buildSystemPromptWithInstructions,
buildPluginPromptSection,
resolveAgentHeartbeatProcedure,
} from "./agent-instructions.js";
import { buildPromptLayers, collapsePromptLayers } from "./prompt-layers.js";
import { heartbeatLog, formatError } from "./logger.js";
import { createRunAuditor, type EngineRunContext } from "./run-audit.js";
import { promptWithFallback } from "./pi.js";
@@ -1838,23 +1838,22 @@ export class HeartbeatMonitor {
}
}
const systemPrompt = buildSystemPromptWithInstructions(
baseHeartbeatSystemPrompt,
[resolvedInstructionsForIdentity, memoryInstructions, selfImprovePrompt].filter((part) => part.trim()).join("\n\n"),
);
const heartbeatContributions = this.pluginRunner
?.getPromptContributionsForSurface("heartbeat")
?? [];
if (heartbeatContributions.length > 0) {
heartbeatLog.log(`applied ${heartbeatContributions.length} plugin prompt contributions for heartbeat surface`);
}
// Build structured layers for cross-session prompt caching.
const heartbeatPluginContributions = buildPluginPromptSection(
"heartbeat",
this.pluginRunner,
);
const systemPromptFinal = heartbeatPluginContributions
? `${systemPrompt}\n\n${heartbeatPluginContributions}`
: systemPrompt;
if (heartbeatPluginContributions) {
heartbeatLog.log(`applied plugin prompt contributions for heartbeat surface`);
}
const heartbeatLayers = buildPromptLayers({
basePrompt: baseHeartbeatSystemPrompt,
agentInstructions: [resolvedInstructionsForIdentity, memoryInstructions, selfImprovePrompt].filter((part) => part.trim()).join("\n\n"),
pluginContributions: heartbeatPluginContributions,
});
const systemPromptFinal = collapsePromptLayers(heartbeatLayers);
// fn_heartbeat_done must be the last tool in the array (stable terminal signal)
heartbeatTools.push(heartbeatDoneTool);
@@ -1948,6 +1947,7 @@ export class HeartbeatMonitor {
pluginRunner: this.pluginRunner,
cwd: rootDir,
systemPrompt: systemPromptFinal,
systemPromptLayers: heartbeatLayers,
tools: "coding",
customTools: heartbeatTools,
defaultProvider: heartbeatSessionModels.defaultProvider,

37
packages/engine/src/triage.ts
View File

@@ -30,9 +30,9 @@ import { AgentLogger } from "./agent-logger.js";
import {
resolveAgentInstructions,
resolveAgentInstructionsWithRatings,
buildSystemPromptWithInstructions,
buildPluginPromptSection,
} from "./agent-instructions.js";
import { buildPromptLayers, collapsePromptLayers } from "./prompt-layers.js";
import { createFallbackModelObserver } from "./fallback-model-observer.js";
import { planLog, reviewerLog, formatError } from "./logger.js";
import {
@@ -1014,30 +1014,29 @@ export class TriageProcessor {
const triageIdentitySection = assignedAgent
? `## Identity\n\nYou are ${assignedAgent.name}${assignedAgent.title?.trim() ? `, ${assignedAgent.title.trim()}` : ""} (agent ID: ${assignedAgent.id}, role: ${assignedAgent.role}).`
: "";
const triageSystemPrompt = buildSystemPromptWithInstructions(
resolveAgentPrompt("triage", settings.agentPrompts)
// Build structured layers for cross-session prompt caching.
const triagePluginContributions = buildPluginPromptSection(
"triage",
this.options.pluginRunner,
);
if (triagePluginContributions) {
planLog.log(`${task.id}: applied plugin prompt contributions for triage surface`);
}
const triageLayers = buildPromptLayers({
basePrompt: resolveAgentPrompt("triage", settings.agentPrompts)
|| (isFast ? FAST_TRIAGE_SYSTEM_PROMPT : TRIAGE_SYSTEM_PROMPT),
[
agentInstructions: [
triageIdentitySection,
triageInstructions,
isResearchToolSurfaceEnabled(settings)
? getResearchGuidanceForSurface("triage")
: "",
].filter((section) => section.trim()).join("\n\n"),
);
const triageContributions = this.options.pluginRunner
?.getPromptContributionsForSurface("triage")
?? [];
if (triageContributions.length > 0) {
planLog.log(`${task.id}: applied ${triageContributions.length} plugin prompt contributions for triage surface`);
}
const triagePluginContributions = buildPluginPromptSection(
"triage",
this.options.pluginRunner,
);
const triageSystemPromptFinal = triagePluginContributions
? `${triageSystemPrompt}\n\n${triagePluginContributions}`
: triageSystemPrompt;
pluginContributions: triagePluginContributions,
});
const triageSystemPromptFinal = collapsePromptLayers(triageLayers);
// Build skill selection context (assigned agent skills take precedence over role fallback)
const skillContext = await buildSessionSkillContext({
@@ -1054,6 +1053,7 @@ export class TriageProcessor {
pluginRunner: this.options.pluginRunner,
cwd: this.rootDir,
systemPrompt: triageSystemPromptFinal,
systemPromptLayers: triageLayers,
tools: "coding",
customTools,
onText: agentLogger.onText,
@@ -1294,6 +1294,7 @@ export class TriageProcessor {
pluginRunner: this.options.pluginRunner,
cwd: this.rootDir,
systemPrompt: triageSystemPromptFinal,
systemPromptLayers: triageLayers,
tools: "coding",
customTools,
onText: agentLogger.onText,