@xopcai/xopc 0.0.99 → 0.0.100

package/dist/src/agent/prompt/system-prompt-params.js

@@ -0,0 +1,74 @@
+import { PACKAGE_VERSION, init_package_version } from "../../package-version.js";
+import { isCronSessionKey, isSubagentSessionKey } from "../../routing/session-key-utils.js";
+import { init_session_key, parseSessionKey } from "../../routing/session-key.js";
+import { normalizePromptSection } from "./cache-boundary.js";
+import { listChannelPlugins } from "../../channels/plugins/registry.js";
+//#region src/agent/prompt/system-prompt-params.ts
+init_package_version();
+init_session_key();
+function resolvePromptMode(sessionKey) {
+	if (!sessionKey) return "full";
+	if (isSubagentSessionKey(sessionKey) || isCronSessionKey(sessionKey)) return "minimal";
+	return "full";
+}
+function resolveRuntimeChannel(sessionKey) {
+	if (!sessionKey) return;
+	return parseSessionKey(sessionKey)?.source;
+}
+function resolveDeliverableChannels(config) {
+	const channels = new Set(["webchat", "cli"]);
+	const configured = config.channels;
+	if (configured) {
+		for (const [id, section] of Object.entries(configured)) if (section?.enabled !== false) channels.add(id);
+	}
+	for (const plugin of listChannelPlugins()) {
+		const id = plugin.id;
+		const section = configured?.[id];
+		if (section?.enabled !== false && section !== void 0) channels.add(id);
+	}
+	return [...channels].sort();
+}
+function normalizeProviderPromptBlock(value) {
+	if (typeof value !== "string") return;
+	return normalizePromptSection(value) || void 0;
+}
+function buildOverridablePromptSection(params) {
+	const override = normalizeProviderPromptBlock(params.override);
+	if (override) return override;
+	return params.fallback;
+}
+function resolveSystemPromptBuildParams(config, params) {
+	const sessionKey = params.sessionKey;
+	const channel = resolveRuntimeChannel(sessionKey);
+	return {
+		workspaceDir: params.workspaceDir,
+		sessionKey,
+		promptMode: params.promptMode ?? resolvePromptMode(sessionKey),
+		toolNames: params.toolNames,
+		toolSummaries: params.toolSummaries,
+		runtimeInfo: {
+			version: PACKAGE_VERSION,
+			model: params.modelRef,
+			channel,
+			agentId: params.agentId,
+			thinkingLevel: params.thinkingLevel
+		},
+		userTimezone: params.userTimezone,
+		channels: resolveDeliverableChannels(config),
+		memoryCitationsMode: params.memoryCitationsMode,
+		includeMemorySection: params.includeMemorySection,
+		heartbeatEnabled: params.heartbeatEnabled,
+		heartbeatPrompt: params.heartbeatPrompt,
+		externalMemoryInstructions: params.externalMemoryInstructions,
+		ttsSystemHint: params.ttsSystemHint,
+		extraSystemPrompt: params.extraSystemPrompt,
+		silentReplyPromptMode: params.silentReplyPromptMode,
+		promptContribution: params.promptContribution,
+		includeProblemSolving: true,
+		includeToneSection: true
+	};
+}
+//#endregion
+export { buildOverridablePromptSection, normalizeProviderPromptBlock, resolveDeliverableChannels, resolvePromptMode, resolveRuntimeChannel, resolveSystemPromptBuildParams };
+
+//# sourceMappingURL=system-prompt-params.js.map

package/dist/src/agent/prompt/system-prompt-params.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"system-prompt-params.js","names":[],"sources":["../../../../src/agent/prompt/system-prompt-params.ts"],"sourcesContent":["import type { Config } from '../../config/schema.js';\nimport { listChannelPlugins } from '../../channels/plugins/registry.js';\nimport { PACKAGE_VERSION } from '../../package-version.js';\nimport { isCronSessionKey, isSubagentSessionKey, parseSessionKey } from '../../routing/session-key.js';\nimport type { ProviderSystemPromptContribution } from './contribution.js';\nimport { normalizePromptSection } from './cache-boundary.js';\nimport type { MemoryCitationsMode, PromptMode, SilentReplyPromptMode } from './types.js';\n\nexport type { RuntimeInfoInput } from './sections/workspace-runtime.js';\n\nexport function resolvePromptMode(sessionKey?: string): PromptMode {\n  if (!sessionKey) {\n    return 'full';\n  }\n  if (isSubagentSessionKey(sessionKey) || isCronSessionKey(sessionKey)) {\n    return 'minimal';\n  }\n  return 'full';\n}\n\nexport function resolveRuntimeChannel(sessionKey?: string): string | undefined {\n  if (!sessionKey) {\n    return undefined;\n  }\n  const parsed = parseSessionKey(sessionKey);\n  return parsed?.source;\n}\n\nexport function resolveDeliverableChannels(config: Config): string[] {\n  const channels = new Set<string>(['webchat', 'cli']);\n  const configured = config.channels as Record<string, { enabled?: boolean }> | undefined;\n  if (configured) {\n    for (const [id, section] of Object.entries(configured)) {\n      if (section?.enabled !== false) {\n        channels.add(id);\n      }\n    }\n  }\n  for (const plugin of listChannelPlugins()) {\n    const id = plugin.id;\n    const section = configured?.[id];\n    if (section?.enabled !== false && section !== undefined) {\n      channels.add(id);\n    }\n  }\n  return [...channels].sort();\n}\n\nexport function normalizeProviderPromptBlock(value?: string): string | undefined {\n  if (typeof value !== 'string') {\n    return undefined;\n  }\n  const normalized = normalizePromptSection(value);\n  return normalized || undefined;\n}\n\nexport function buildOverridablePromptSection(params: {\n  override?: string;\n  fallback: string;\n}): string {\n  const override = normalizeProviderPromptBlock(params.override);\n  if (override) {\n    return override;\n  }\n  return params.fallback;\n}\n\nexport interface SystemPromptBuildParams {\n  workspaceDir: string;\n  sessionKey?: string;\n  promptMode?: PromptMode;\n  toolNames?: string[];\n  toolSummaries?: Record<string, string>;\n  runtimeInfo?: import('./sections/workspace-runtime.js').RuntimeInfoInput;\n  userTimezone?: string;\n  channels?: string[];\n  memoryCitationsMode?: MemoryCitationsMode;\n  includeMemorySection?: boolean;\n  heartbeatEnabled?: boolean;\n  heartbeatPrompt?: string;\n  externalMemoryInstructions?: string;\n  ttsSystemHint?: string;\n  extraSystemPrompt?: string;\n  silentReplyPromptMode?: SilentReplyPromptMode;\n  promptContribution?: ProviderSystemPromptContribution;\n  includeProblemSolving?: boolean;\n  includeToneSection?: boolean;\n}\n\nexport function resolveSystemPromptBuildParams(\n  config: Config,\n  params: {\n    workspaceDir: string;\n    sessionKey?: string;\n    toolNames?: string[];\n    toolSummaries?: Record<string, string>;\n    userTimezone?: string;\n    externalMemoryInstructions?: string;\n    heartbeatEnabled?: boolean;\n    heartbeatPrompt?: string;\n    ttsSystemHint?: string;\n    extraSystemPrompt?: string;\n    modelRef?: string;\n    agentId?: string;\n    thinkingLevel?: string;\n    promptMode?: PromptMode;\n    silentReplyPromptMode?: SilentReplyPromptMode;\n    promptContribution?: ProviderSystemPromptContribution;\n    memoryCitationsMode?: MemoryCitationsMode;\n    includeMemorySection?: boolean;\n  },\n): SystemPromptBuildParams {\n  const sessionKey = params.sessionKey;\n  const channel = resolveRuntimeChannel(sessionKey);\n  return {\n    workspaceDir: params.workspaceDir,\n    sessionKey,\n    promptMode: params.promptMode ?? resolvePromptMode(sessionKey),\n    toolNames: params.toolNames,\n    toolSummaries: params.toolSummaries,\n    runtimeInfo: {\n      version: PACKAGE_VERSION,\n      model: params.modelRef,\n      channel,\n      agentId: params.agentId,\n      thinkingLevel: params.thinkingLevel,\n    },\n    userTimezone: params.userTimezone,\n    channels: resolveDeliverableChannels(config),\n    memoryCitationsMode: params.memoryCitationsMode,\n    includeMemorySection: params.includeMemorySection,\n    heartbeatEnabled: params.heartbeatEnabled,\n    heartbeatPrompt: params.heartbeatPrompt,\n    externalMemoryInstructions: params.externalMemoryInstructions,\n    ttsSystemHint: params.ttsSystemHint,\n    extraSystemPrompt: params.extraSystemPrompt,\n    silentReplyPromptMode: params.silentReplyPromptMode,\n    promptContribution: params.promptContribution,\n    includeProblemSolving: true,\n    includeToneSection: true,\n  };\n}\n"],"mappings":";;;;;;sBAE2D;kBAC4C;AAOvG,SAAgB,kBAAkB,YAAiC;AACjE,KAAI,CAAC,WACH,QAAO;AAET,KAAI,qBAAqB,WAAW,IAAI,iBAAiB,WAAW,CAClE,QAAO;AAET,QAAO;;AAGT,SAAgB,sBAAsB,YAAyC;AAC7E,KAAI,CAAC,WACH;AAGF,QADe,gBAAgB,WAClB,EAAE;;AAGjB,SAAgB,2BAA2B,QAA0B;CACnE,MAAM,WAAW,IAAI,IAAY,CAAC,WAAW,MAAM,CAAC;CACpD,MAAM,aAAa,OAAO;AAC1B,KAAI;OACG,MAAM,CAAC,IAAI,YAAY,OAAO,QAAQ,WAAW,CACpD,KAAI,SAAS,YAAY,MACvB,UAAS,IAAI,GAAG;;AAItB,MAAK,MAAM,UAAU,oBAAoB,EAAE;EACzC,MAAM,KAAK,OAAO;EAClB,MAAM,UAAU,aAAa;AAC7B,MAAI,SAAS,YAAY,SAAS,YAAY,KAAA,EAC5C,UAAS,IAAI,GAAG;;AAGpB,QAAO,CAAC,GAAG,SAAS,CAAC,MAAM;;AAG7B,SAAgB,6BAA6B,OAAoC;AAC/E,KAAI,OAAO,UAAU,SACnB;AAGF,QADmB,uBAAuB,MACzB,IAAI,KAAA;;AAGvB,SAAgB,8BAA8B,QAGnC;CACT,MAAM,WAAW,6BAA6B,OAAO,SAAS;AAC9D,KAAI,SACF,QAAO;AAET,QAAO,OAAO;;AAyBhB,SAAgB,+BACd,QACA,QAoByB;CACzB,MAAM,aAAa,OAAO;CAC1B,MAAM,UAAU,sBAAsB,WAAW;AACjD,QAAO;EACL,cAAc,OAAO;EACrB;EACA,YAAY,OAAO,cAAc,kBAAkB,WAAW;EAC9D,WAAW,OAAO;EAClB,eAAe,OAAO;EACtB,aAAa;GACX,SAAS;GACT,OAAO,OAAO;GACd;GACA,SAAS,OAAO;GAChB,eAAe,OAAO;GACvB;EACD,cAAc,OAAO;EACrB,UAAU,2BAA2B,OAAO;EAC5C,qBAAqB,OAAO;EAC5B,sBAAsB,OAAO;EAC7B,kBAAkB,OAAO;EACzB,iBAAiB,OAAO;EACxB,4BAA4B,OAAO;EACnC,eAAe,OAAO;EACtB,mBAAmB,OAAO;EAC1B,uBAAuB,OAAO;EAC9B,oBAAoB,OAAO;EAC3B,uBAAuB;EACvB,oBAAoB;EACrB"}

package/dist/src/agent/prompt/system-prompt.d.ts

@@ -6,29 +6,40 @@
  * not to manually reread startup files.
  */
 import type { EmbeddedContextFile } from '../bootstrap/types.js';
-import type { PromptMode } from './types.js';
-export type MemoryCitationsMode = 'on' | 'off' | 'source-only';
+import type { ProviderSystemPromptContribution } from './contribution.js';
+import { type RuntimeInfoInput } from './sections/workspace-runtime.js';
+import type { MemoryCitationsMode, PromptMode, SilentReplyPromptMode } from './types.js';
+export type { MemoryCitationsMode } from './types.js';
+export { getContextFileBasename, isDynamicContextFile, sortContextFilesForPrompt, } from './sections/project-context.js';
 export interface SystemPromptOptions {
-    /** Bootstrap context files from profile Markdown (Project Context). */
     contextFiles?: EmbeddedContextFile[];
     promptMode?: PromptMode;
     heartbeatEnabled?: boolean;
     heartbeatPrompt?: string;
+    /** Registered tool names for Tooling section and memory/skills gating. */
+    toolNames?: string[];
+    toolSummaries?: Record<string, string>;
+    /** @deprecated Prefer toolNames — kept for skill-section gating compatibility. */
     availableTools?: string[];
     memoryCitationsMode?: MemoryCitationsMode;
+    includeMemorySection?: boolean;
     userTimezone?: string;
-    runtime?: {
-        version?: string;
-        model?: string;
-        channel?: string;
-    };
+    runtime?: RuntimeInfoInput;
     channels?: string[];
     externalMemoryInstructions?: string;
     ttsSystemHint?: string;
+    extraSystemPrompt?: string;
+    silentReplyPromptMode?: SilentReplyPromptMode;
+    promptContribution?: ProviderSystemPromptContribution;
+    includeProblemSolving?: boolean;
+    includeToneSection?: boolean;
 }
 /**
  * Build system prompt with bootstrap Project Context integration.
  */
-export declare function buildSystemPrompt(workspaceDir: string, options: SystemPromptOptions): string;
-/** Whether HEARTBEAT.md is injected as dynamic context (vs behavior-only section). */
-export declare function isHeartbeatContextFile(pathValue: string): boolean;
+export declare function buildSystemPrompt(workspaceDir: string, options?: SystemPromptOptions): string;
+/** Split a built prompt at the cache boundary (for tests and provider adapters). */
+export declare function splitBuiltSystemPrompt(text: string): {
+    stablePrefix: string;
+    dynamicSuffix: string;
+};

package/dist/src/agent/prompt/system-prompt.js

@@ -1,223 +1,109 @@
-import { DEFAULT_HEARTBEAT_FILENAME } from "../context/workspace.js";
-import { PROMPT_CACHE_BOUNDARY } from "./cache-boundary.js";
+import { PROMPT_CACHE_BOUNDARY, splitPromptCacheBoundary } from "./cache-boundary.js";
+import { buildAestheticSection, buildExecutionBiasSection, buildProblemSolvingSection, buildSafetySection, buildToolCallStyleSection } from "./sections/behavior.js";
+import { buildExternalMemorySection, buildMemorySection, buildSkillsSection } from "./sections/memory-skills.js";
+import { buildHeartbeatBehaviorSection, buildMessagingSection, buildOutputDirectivesSection, buildSilentRepliesSection, buildTimeSection } from "./sections/messaging-runtime.js";
+import { buildProjectContextSection, getContextFileBasename, isDynamicContextFile, sortContextFilesForPrompt } from "./sections/project-context.js";
+import { buildToolingSection, hasSkillsTools } from "./sections/tooling.js";
+import { buildRuntimeSection, buildWorkspaceFilesIntroSection, buildWorkspaceSection } from "./sections/workspace-runtime.js";
+import { buildOverridablePromptSection } from "./system-prompt-params.js";
 //#region src/agent/prompt/system-prompt.ts
-const CONTEXT_FILE_ORDER = new Map([
-	["agents.md", 10],
-	["soul.md", 20],
-	["identity.md", 30],
-	["user.md", 40],
-	["tools.md", 50],
-	["memory.md", 70]
-]);
-const DYNAMIC_CONTEXT_FILE_BASENAMES = new Set(["heartbeat.md"]);
-const DEFAULT_HEARTBEAT_PROMPT_CONTEXT_BLOCK = "Default heartbeat prompt:\n`Read HEARTBEAT.md if it exists (workspace context). Follow it strictly. Do not infer or repeat old tasks from prior chats. If nothing needs attention, reply HEARTBEAT_OK.`";
-function normalizeContextFilePath(pathValue) {
-	return pathValue.trim().replace(/\\/g, "/");
-}
-function getContextFileBasename(pathValue) {
-	const normalizedPath = normalizeContextFilePath(pathValue);
-	return (normalizedPath.split("/").pop() ?? normalizedPath).toLowerCase();
-}
-function isDynamicContextFile(pathValue) {
-	return DYNAMIC_CONTEXT_FILE_BASENAMES.has(getContextFileBasename(pathValue));
-}
-function sanitizeContextFileContentForPrompt(content) {
-	return content.replaceAll(DEFAULT_HEARTBEAT_PROMPT_CONTEXT_BLOCK, "").replace(/\n{3,}/g, "\n\n");
-}
-function sortContextFilesForPrompt(contextFiles) {
-	return [...contextFiles].sort((a, b) => {
-		const aBase = getContextFileBasename(a.path);
-		const bBase = getContextFileBasename(b.path);
-		const aOrder = CONTEXT_FILE_ORDER.get(aBase) ?? Number.MAX_SAFE_INTEGER;
-		const bOrder = CONTEXT_FILE_ORDER.get(bBase) ?? Number.MAX_SAFE_INTEGER;
-		if (aOrder !== bOrder) return aOrder - bOrder;
-		if (aBase !== bBase) return aBase.localeCompare(bBase);
-		return normalizeContextFilePath(a.path).localeCompare(normalizeContextFilePath(b.path));
-	});
-}
-function buildProjectContextSection(params) {
-	if (params.files.length === 0) return [];
-	const lines = [params.heading, ""];
-	if (params.dynamic) lines.push("The following frequently-changing project context files are kept below the cache boundary when possible:", "");
-	else {
-		const hasSoulFile = params.files.some((file) => getContextFileBasename(file.path) === "soul.md");
-		lines.push("The following project context files have been loaded:");
-		if (hasSoulFile) lines.push("If SOUL.md is present, embody its persona and tone. Avoid stiff, generic replies; follow its guidance unless higher-priority instructions override it.");
-		lines.push("");
-	}
-	for (const file of params.files) lines.push(`## ${file.path}`, "", sanitizeContextFileContentForPrompt(file.content), "");
-	return lines;
-}
-function buildMemorySection(citationsMode = "on", hasProfileMemory = false) {
-	if (!hasProfileMemory) return "";
-	return `## Memory Recall
-
-${citationsMode === "off" ? "Citations are disabled: do not mention file paths or line numbers in replies." : citationsMode === "source-only" ? "Citations: mention file path when it helps (e.g., Source: MEMORY.md)." : "Citations: include Source: <path#line> when it helps the user verify memory snippets."}
-
-Startup profile files (SOUL, USER, MEMORY, etc.) are already in Project Context above. Do not re-read them unless the user asks or you need lines beyond what was injected.
-
-Before answering anything about prior work, decisions, dates, people, preferences, or todos:
-1. Run \`memory_search\` on profile MEMORY.md and workspace \`memory/*.md\`
-2. For **other chat sessions** / cross-session history, use \`session_search\` with keywords (or omit \`query\` to list recent sessions)
-3. Use \`memory_get\` to pull only the needed lines from files
-4. For structured curated notes under agent home \`memories/\`, use \`curated_memory\`
-5. If low confidence after search, say you checked
-
-### Memory Files
-
-- **Daily notes:** \`memory/YYYY-MM-DD.md\` — raw logs (runtime may preload recent days on /new or /reset)
-- **Long-term:** profile \`MEMORY.md\` — curated memories in Project Context when present
-- **Curated store:** agent home \`memories/MEMORY.md\` and \`memories/USER.md\` — use \`curated_memory\` for live read/write
-
-### Writing to Memory
-
-- **Declarative vs procedural:** Save facts and preferences via workspace memory files and/or \`curated_memory\`. Save reusable task playbooks with \`skill_manage\` as skills.
-- **Memory is limited** — if you want to remember something, WRITE IT TO A FILE
-- When someone says "remember this" → update \`memory/YYYY-MM-DD.md\` or relevant file
-- **Text > Brain**
-`;
-}
-function buildSkillsSection(availableTools = []) {
-	if (availableTools.length === 0) return "";
-	return `## Skills
-
-When a solution already exists, do not reinvent the wheel.
-
-**How to use:**
-1. Skim <available_skills> — is anything clearly relevant?
-2. Only one match? → Confirm with skills_list, then load the full text with skill_view(name) and follow it.
-3. Need sub-documents or scripts? → skill_view(name, "references/…"), etc.
-4. No match? → Solve it yourself; do not force-fit a skill.
-
-**Division of labor with memory:** Skills = **procedural** workflows; memory / \`curated_memory\` = **declarative** facts and preferences.
-`;
-}
-function buildSafetySection() {
-	return `## Safety
-
-- You have no independent goals: do not pursue self-preservation, replication, resource acquisition, or power-seeking; avoid long-term plans beyond the user's request.
-- Prioritize safety and human oversight over completion; if instructions conflict, pause and ask; comply with stop/pause/audit requests and never bypass safeguards.
-- Do not manipulate or persuade anyone to expand access or disable safeguards. Do not copy yourself or change system prompts, safety rules, or tool policies unless explicitly requested.`;
-}
-function buildProblemSolvingSection() {
-	return `## Problem Solving
-
-**Simple tasks** (< 5 minutes or a single-file change): Do them directly; run a quick verification after changes.
-
-**Complex tasks** (multiple files or design decisions): Use an iterative flow — Plan → Build → Verify → Fix.
-
-**Core principle: Match the complexity; reject ritual for its own sake. Verification matters, but do not verify just to tick a box.**`;
-}
-function buildAestheticSection() {
-	return `## Tone & Style
-
-**Default voice:** Direct, concise, concrete.
-
-**SOUL.md takes precedence:** If SOUL.md defines a specific tone, defer to it over the above.`;
-}
-function buildHeartbeatBehaviorSection(params) {
-	if (!params.enabled) return "";
-	if (params.customPrompt?.trim()) return `## Heartbeats\n\n${params.customPrompt.trim()}\n`;
-	let quietHoursNote = "";
-	if (params.userTimezone) quietHoursNote = `\n\n> Quiet hours: The user is in **${params.userTimezone}**. Avoid proactive checks during late night (23:00-08:00) unless urgent.`;
-	return `## Heartbeats
-
-If the current user message is a heartbeat poll and nothing needs attention, reply exactly: HEARTBEAT_OK
-
-If something needs attention, do NOT include "HEARTBEAT_OK"; reply with the alert text instead.${quietHoursNote}
-`;
-}
-function buildMessagingSection(channels = [], isMinimal = false) {
-	if (isMinimal || channels.length === 0) return "";
-	return `## Messaging
-
-- Reply in current session → automatically routes to the source channel (${channels.join(", ")})
-- Use \`message\` for proactive sends + channel actions
-- If you use \`message\` to deliver your user-visible reply, respond with ONLY: NO_REPLY (avoid duplicate replies)
-`;
-}
-function buildTimeSection(timezone) {
-	if (!timezone) return "";
-	return `## Current Date & Time
-
-Time zone: ${timezone}
-
-If you need the current date/time/day-of-week, use the \`session_status\` tool or the inbound message timestamp envelope (when present).
-`;
-}
-function buildRuntimeSection(runtime) {
-	if (!runtime) return "";
-	const parts = [];
-	if (runtime.version) parts.push(`v${runtime.version}`);
-	if (runtime.model) parts.push(`model=${runtime.model.split("/").pop()}`);
-	if (runtime.channel) parts.push(`ch=${runtime.channel}`);
-	return parts.length > 0 ? `[${parts.join(" | ")}]` : "";
-}
-function buildWorkingDirSection(workspaceDir) {
-	return `Working directory: ${workspaceDir}`;
-}
-function buildExternalMemorySection(text) {
-	const t = text?.trim();
-	if (!t) return "";
-	return `## External memory provider\n\n${t}`;
+function joinSections(sections) {
+	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }
 /**
 * Build system prompt with bootstrap Project Context integration.
 */
-function buildSystemPrompt(workspaceDir, options) {
-	const { contextFiles = [], promptMode = "full", heartbeatEnabled = false, heartbeatPrompt, availableTools = [], memoryCitationsMode = "on", userTimezone, runtime, channels = [], externalMemoryInstructions, ttsSystemHint } = options;
+function buildSystemPrompt(workspaceDir, options = {}) {
+	const { contextFiles = [], promptMode = "full", heartbeatEnabled = false, heartbeatPrompt, toolNames: toolNamesOption, toolSummaries, availableTools = [], memoryCitationsMode = "on", includeMemorySection, userTimezone, runtime, channels = [], externalMemoryInstructions, ttsSystemHint, extraSystemPrompt, silentReplyPromptMode = "generic", promptContribution, includeProblemSolving = true, includeToneSection = true } = options;
 	if (promptMode === "none") return "You are a personal AI assistant running inside xopc.";
 	const isMinimal = promptMode === "minimal";
+	const toolNames = toolNamesOption ?? availableTools;
+	const normalizedTools = new Set(toolNames.map((tool) => tool.toLowerCase()));
+	const sectionOverrides = promptContribution?.sectionOverrides ?? {};
 	const orderedContextFiles = sortContextFilesForPrompt(contextFiles.filter((file) => file.path.trim().length > 0));
 	const stableContextFiles = orderedContextFiles.filter((file) => !isDynamicContextFile(file.path));
 	const dynamicContextFiles = orderedContextFiles.filter((file) => isDynamicContextFile(file.path));
 	const hasProfileMemory = orderedContextFiles.some((file) => getContextFileBasename(file.path) === "memory.md");
-	const sections = [
+	const stableSections = [
 		"You are a personal AI assistant running inside xopc.",
-		"",
-		"## Workspace Files (injected)",
-		"",
-		"Profile bootstrap files are injected below as Project Context. Do not manually reread them at session start unless the user asks or injected content is insufficient.",
-		""
+		buildToolingSection({
+			toolNames,
+			toolSummaries
+		}),
+		buildOverridablePromptSection({
+			override: sectionOverrides.tool_call_style,
+			fallback: buildToolCallStyleSection()
+		})
 	];
+	if (!isMinimal) stableSections.push(buildOverridablePromptSection({
+		override: sectionOverrides.execution_bias,
+		fallback: buildExecutionBiasSection()
+	}));
+	const providerStablePrefix = buildOverridablePromptSection({
+		override: promptContribution?.stablePrefix,
+		fallback: ""
+	});
+	if (providerStablePrefix) stableSections.push(providerStablePrefix);
+	stableSections.push(buildSafetySection());
+	if (hasSkillsTools(toolNames)) stableSections.push(buildSkillsSection(true));
 	if (!isMinimal) {
-		sections.push(buildTimeSection(userTimezone));
-		sections.push(buildExternalMemorySection(externalMemoryInstructions));
-		sections.push(buildMemorySection(memoryCitationsMode, hasProfileMemory));
-	}
-	sections.push(buildSkillsSection(availableTools));
-	if (!isMinimal) {
-		sections.push(buildSafetySection());
-		sections.push(buildProblemSolvingSection());
-		sections.push(buildAestheticSection());
+		stableSections.push(buildMemorySection({
+			availableTools: normalizedTools,
+			citationsMode: memoryCitationsMode,
+			hasProfileMemory,
+			includeMemorySection
+		}), buildExternalMemorySection(externalMemoryInstructions));
+		if (includeProblemSolving) stableSections.push(buildProblemSolvingSection());
+		if (includeToneSection) stableSections.push(buildAestheticSection());
+		stableSections.push(buildTimeSection(userTimezone));
 	}
-	sections.push(...buildProjectContextSection({
+	stableSections.push(buildWorkspaceSection(workspaceDir), buildWorkspaceFilesIntroSection());
+	if (!isMinimal) stableSections.push(buildOutputDirectivesSection(isMinimal));
+	stableSections.push(buildMessagingSection({
+		channels,
+		isMinimal,
+		hasSendMessage: normalizedTools.has("send_message")
+	}));
+	if (!isMinimal && ttsSystemHint?.trim()) stableSections.push(`## Voice (TTS)\n\n${ttsSystemHint.trim()}`);
+	stableSections.push(joinSections(buildProjectContextSection({
 		files: stableContextFiles,
 		heading: "# Project Context",
 		dynamic: false
+	})));
+	if (!isMinimal) stableSections.push(buildSilentRepliesSection({
+		isMinimal,
+		silentReplyPromptMode
 	}));
-	sections.push(PROMPT_CACHE_BOUNDARY);
-	sections.push(...buildProjectContextSection({
+	const dynamicSections = [];
+	dynamicSections.push(joinSections(buildProjectContextSection({
 		files: dynamicContextFiles,
 		heading: stableContextFiles.length > 0 ? "# Dynamic Project Context" : "# Project Context",
 		dynamic: true
-	}));
-	sections.push(buildHeartbeatBehaviorSection({
+	})));
+	if (extraSystemPrompt?.trim()) {
+		const contextHeader = isMinimal ? "## Subagent Context" : "## Group Chat Context";
+		dynamicSections.push(`${contextHeader}\n\n${extraSystemPrompt.trim()}`);
+	}
+	const providerDynamicSuffix = buildOverridablePromptSection({
+		override: promptContribution?.dynamicSuffix,
+		fallback: ""
+	});
+	if (providerDynamicSuffix) dynamicSections.push(providerDynamicSuffix);
+	dynamicSections.push(buildHeartbeatBehaviorSection({
 		enabled: heartbeatEnabled,
 		customPrompt: heartbeatPrompt,
 		userTimezone
-	}));
-	sections.push(buildWorkingDirSection(workspaceDir));
-	sections.push(buildMessagingSection(channels, isMinimal));
-	if (!isMinimal && ttsSystemHint?.trim()) sections.push(`## Voice (TTS)\n\n${ttsSystemHint.trim()}`);
-	sections.push(buildRuntimeSection(runtime));
-	return sections.filter(Boolean).join("\n\n");
+	}), buildRuntimeSection(runtime));
+	const stablePrefix = joinSections(stableSections);
+	const dynamicSuffix = joinSections(dynamicSections);
+	if (!dynamicSuffix.trim()) return `${stablePrefix}\n\n${PROMPT_CACHE_BOUNDARY}`.trim();
+	return `${stablePrefix}\n\n${PROMPT_CACHE_BOUNDARY}\n\n${dynamicSuffix}`.trim();
 }
-/** Whether HEARTBEAT.md is injected as dynamic context (vs behavior-only section). */
-function isHeartbeatContextFile(pathValue) {
-	return getContextFileBasename(pathValue) === DEFAULT_HEARTBEAT_FILENAME.toLowerCase();
+/** Split a built prompt at the cache boundary (for tests and provider adapters). */
+function splitBuiltSystemPrompt(text) {
+	return splitPromptCacheBoundary(text);
 }
 //#endregion
-export { buildSystemPrompt, isHeartbeatContextFile };
+export { buildSystemPrompt, getContextFileBasename, isDynamicContextFile, sortContextFilesForPrompt, splitBuiltSystemPrompt };
 
 //# sourceMappingURL=system-prompt.js.map

package/dist/src/agent/prompt/system-prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-prompt.js","names":[],"sources":["../../../../src/agent/prompt/system-prompt.ts"],"sourcesContent":["/**\n * System Prompt Builder — xopc-owned prompt with OpenClaw-style bootstrap injection.\n *\n * Profile Markdown under `agents/<id>/profile/` is injected as Project Context\n * (see `src/agent/bootstrap/`). Runtime owns loading; AGENTS.md instructs agents\n * not to manually reread startup files.\n */\n\nimport type { EmbeddedContextFile } from '../bootstrap/types.js';\nimport { DEFAULT_HEARTBEAT_FILENAME } from '../context/workspace.js';\nimport { PROMPT_CACHE_BOUNDARY } from './cache-boundary.js';\nimport type { PromptMode } from './types.js';\n\nexport type MemoryCitationsMode = 'on' | 'off' | 'source-only';\n\nconst CONTEXT_FILE_ORDER = new Map<string, number>([\n  ['agents.md', 10],\n  ['soul.md', 20],\n  ['identity.md', 30],\n  ['user.md', 40],\n  ['tools.md', 50],\n  ['memory.md', 70],\n]);\n\nconst DYNAMIC_CONTEXT_FILE_BASENAMES = new Set(['heartbeat.md']);\n\nconst DEFAULT_HEARTBEAT_PROMPT_CONTEXT_BLOCK =\n  'Default heartbeat prompt:\\n`Read HEARTBEAT.md if it exists (workspace context). Follow it strictly. Do not infer or repeat old tasks from prior chats. If nothing needs attention, reply HEARTBEAT_OK.`';\n\nfunction normalizeContextFilePath(pathValue: string): string {\n  return pathValue.trim().replace(/\\\\/g, '/');\n}\n\nfunction getContextFileBasename(pathValue: string): string {\n  const normalizedPath = normalizeContextFilePath(pathValue);\n  return (normalizedPath.split('/').pop() ?? normalizedPath).toLowerCase();\n}\n\nfunction isDynamicContextFile(pathValue: string): boolean {\n  return DYNAMIC_CONTEXT_FILE_BASENAMES.has(getContextFileBasename(pathValue));\n}\n\nfunction sanitizeContextFileContentForPrompt(content: string): string {\n  return content.replaceAll(DEFAULT_HEARTBEAT_PROMPT_CONTEXT_BLOCK, '').replace(/\\n{3,}/g, '\\n\\n');\n}\n\nfunction sortContextFilesForPrompt(contextFiles: EmbeddedContextFile[]): EmbeddedContextFile[] {\n  return [...contextFiles].sort((a, b) => {\n    const aBase = getContextFileBasename(a.path);\n    const bBase = getContextFileBasename(b.path);\n    const aOrder = CONTEXT_FILE_ORDER.get(aBase) ?? Number.MAX_SAFE_INTEGER;\n    const bOrder = CONTEXT_FILE_ORDER.get(bBase) ?? Number.MAX_SAFE_INTEGER;\n    if (aOrder !== bOrder) {\n      return aOrder - bOrder;\n    }\n    if (aBase !== bBase) {\n      return aBase.localeCompare(bBase);\n    }\n    return normalizeContextFilePath(a.path).localeCompare(normalizeContextFilePath(b.path));\n  });\n}\n\nfunction buildProjectContextSection(params: {\n  files: EmbeddedContextFile[];\n  heading: string;\n  dynamic: boolean;\n}): string[] {\n  if (params.files.length === 0) {\n    return [];\n  }\n  const lines: string[] = [params.heading, ''];\n  if (params.dynamic) {\n    lines.push(\n      'The following frequently-changing project context files are kept below the cache boundary when possible:',\n      '',\n    );\n  } else {\n    const hasSoulFile = params.files.some((file) => getContextFileBasename(file.path) === 'soul.md');\n    lines.push('The following project context files have been loaded:');\n    if (hasSoulFile) {\n      lines.push(\n        'If SOUL.md is present, embody its persona and tone. Avoid stiff, generic replies; follow its guidance unless higher-priority instructions override it.',\n      );\n    }\n    lines.push('');\n  }\n  for (const file of params.files) {\n    lines.push(`## ${file.path}`, '', sanitizeContextFileContentForPrompt(file.content), '');\n  }\n  return lines;\n}\n\nfunction buildMemorySection(\n  citationsMode: MemoryCitationsMode = 'on',\n  hasProfileMemory = false,\n): string {\n  if (!hasProfileMemory) {\n    return '';\n  }\n\n  const citationInstruction =\n    citationsMode === 'off'\n      ? 'Citations are disabled: do not mention file paths or line numbers in replies.'\n      : citationsMode === 'source-only'\n        ? 'Citations: mention file path when it helps (e.g., Source: MEMORY.md).'\n        : 'Citations: include Source: <path#line> when it helps the user verify memory snippets.';\n\n  return `## Memory Recall\n\n${citationInstruction}\n\nStartup profile files (SOUL, USER, MEMORY, etc.) are already in Project Context above. Do not re-read them unless the user asks or you need lines beyond what was injected.\n\nBefore answering anything about prior work, decisions, dates, people, preferences, or todos:\n1. Run \\`memory_search\\` on profile MEMORY.md and workspace \\`memory/*.md\\`\n2. For **other chat sessions** / cross-session history, use \\`session_search\\` with keywords (or omit \\`query\\` to list recent sessions)\n3. Use \\`memory_get\\` to pull only the needed lines from files\n4. For structured curated notes under agent home \\`memories/\\`, use \\`curated_memory\\`\n5. If low confidence after search, say you checked\n\n### Memory Files\n\n- **Daily notes:** \\`memory/YYYY-MM-DD.md\\` — raw logs (runtime may preload recent days on /new or /reset)\n- **Long-term:** profile \\`MEMORY.md\\` — curated memories in Project Context when present\n- **Curated store:** agent home \\`memories/MEMORY.md\\` and \\`memories/USER.md\\` — use \\`curated_memory\\` for live read/write\n\n### Writing to Memory\n\n- **Declarative vs procedural:** Save facts and preferences via workspace memory files and/or \\`curated_memory\\`. Save reusable task playbooks with \\`skill_manage\\` as skills.\n- **Memory is limited** — if you want to remember something, WRITE IT TO A FILE\n- When someone says \"remember this\" → update \\`memory/YYYY-MM-DD.md\\` or relevant file\n- **Text > Brain**\n`;\n}\n\nfunction buildSkillsSection(availableTools: string[] = []): string {\n  if (availableTools.length === 0) {\n    return '';\n  }\n\n  return `## Skills\n\nWhen a solution already exists, do not reinvent the wheel.\n\n**How to use:**\n1. Skim <available_skills> — is anything clearly relevant?\n2. Only one match? → Confirm with skills_list, then load the full text with skill_view(name) and follow it.\n3. Need sub-documents or scripts? → skill_view(name, \"references/…\"), etc.\n4. No match? → Solve it yourself; do not force-fit a skill.\n\n**Division of labor with memory:** Skills = **procedural** workflows; memory / \\`curated_memory\\` = **declarative** facts and preferences.\n`;\n}\n\nfunction buildSafetySection(): string {\n  return `## Safety\n\n- You have no independent goals: do not pursue self-preservation, replication, resource acquisition, or power-seeking; avoid long-term plans beyond the user's request.\n- Prioritize safety and human oversight over completion; if instructions conflict, pause and ask; comply with stop/pause/audit requests and never bypass safeguards.\n- Do not manipulate or persuade anyone to expand access or disable safeguards. Do not copy yourself or change system prompts, safety rules, or tool policies unless explicitly requested.`;\n}\n\nfunction buildProblemSolvingSection(): string {\n  return `## Problem Solving\n\n**Simple tasks** (< 5 minutes or a single-file change): Do them directly; run a quick verification after changes.\n\n**Complex tasks** (multiple files or design decisions): Use an iterative flow — Plan → Build → Verify → Fix.\n\n**Core principle: Match the complexity; reject ritual for its own sake. Verification matters, but do not verify just to tick a box.**`;\n}\n\nfunction buildAestheticSection(): string {\n  return `## Tone & Style\n\n**Default voice:** Direct, concise, concrete.\n\n**SOUL.md takes precedence:** If SOUL.md defines a specific tone, defer to it over the above.`;\n}\n\nfunction buildHeartbeatBehaviorSection(params: {\n  enabled: boolean;\n  customPrompt?: string;\n  userTimezone?: string;\n}): string {\n  if (!params.enabled) {\n    return '';\n  }\n  if (params.customPrompt?.trim()) {\n    return `## Heartbeats\\n\\n${params.customPrompt.trim()}\\n`;\n  }\n  let quietHoursNote = '';\n  if (params.userTimezone) {\n    quietHoursNote = `\\n\\n> Quiet hours: The user is in **${params.userTimezone}**. Avoid proactive checks during late night (23:00-08:00) unless urgent.`;\n  }\n  return `## Heartbeats\n\nIf the current user message is a heartbeat poll and nothing needs attention, reply exactly: HEARTBEAT_OK\n\nIf something needs attention, do NOT include \"HEARTBEAT_OK\"; reply with the alert text instead.${quietHoursNote}\n`;\n}\n\nfunction buildMessagingSection(channels: string[] = [], isMinimal: boolean = false): string {\n  if (isMinimal || channels.length === 0) {\n    return '';\n  }\n  const channelList = channels.join(', ');\n  return `## Messaging\n\n- Reply in current session → automatically routes to the source channel (${channelList})\n- Use \\`message\\` for proactive sends + channel actions\n- If you use \\`message\\` to deliver your user-visible reply, respond with ONLY: NO_REPLY (avoid duplicate replies)\n`;\n}\n\nfunction buildTimeSection(timezone?: string): string {\n  if (!timezone) {\n    return '';\n  }\n  return `## Current Date & Time\n\nTime zone: ${timezone}\n\nIf you need the current date/time/day-of-week, use the \\`session_status\\` tool or the inbound message timestamp envelope (when present).\n`;\n}\n\nfunction buildRuntimeSection(runtime?: { version?: string; model?: string; channel?: string }): string {\n  if (!runtime) {\n    return '';\n  }\n  const parts: string[] = [];\n  if (runtime.version) parts.push(`v${runtime.version}`);\n  if (runtime.model) parts.push(`model=${runtime.model.split('/').pop()}`);\n  if (runtime.channel) parts.push(`ch=${runtime.channel}`);\n  return parts.length > 0 ? `[${parts.join(' | ')}]` : '';\n}\n\nfunction buildWorkingDirSection(workspaceDir: string): string {\n  return `Working directory: ${workspaceDir}`;\n}\n\nfunction buildExternalMemorySection(text: string | undefined): string {\n  const t = text?.trim();\n  if (!t) {\n    return '';\n  }\n  return `## External memory provider\\n\\n${t}`;\n}\n\nexport interface SystemPromptOptions {\n  /** Bootstrap context files from profile Markdown (Project Context). */\n  contextFiles?: EmbeddedContextFile[];\n  promptMode?: PromptMode;\n  heartbeatEnabled?: boolean;\n  heartbeatPrompt?: string;\n  availableTools?: string[];\n  memoryCitationsMode?: MemoryCitationsMode;\n  userTimezone?: string;\n  runtime?: {\n    version?: string;\n    model?: string;\n    channel?: string;\n  };\n  channels?: string[];\n  externalMemoryInstructions?: string;\n  ttsSystemHint?: string;\n}\n\n/**\n * Build system prompt with bootstrap Project Context integration.\n */\nexport function buildSystemPrompt(workspaceDir: string, options: SystemPromptOptions): string {\n  const {\n    contextFiles = [],\n    promptMode = 'full',\n    heartbeatEnabled = false,\n    heartbeatPrompt,\n    availableTools = [],\n    memoryCitationsMode = 'on',\n    userTimezone,\n    runtime,\n    channels = [],\n    externalMemoryInstructions,\n    ttsSystemHint,\n  } = options;\n\n  if (promptMode === 'none') {\n    return 'You are a personal AI assistant running inside xopc.';\n  }\n\n  const isMinimal = promptMode === 'minimal';\n  const orderedContextFiles = sortContextFilesForPrompt(\n    contextFiles.filter((file) => file.path.trim().length > 0),\n  );\n  const stableContextFiles = orderedContextFiles.filter((file) => !isDynamicContextFile(file.path));\n  const dynamicContextFiles = orderedContextFiles.filter((file) => isDynamicContextFile(file.path));\n  const hasProfileMemory = orderedContextFiles.some(\n    (file) => getContextFileBasename(file.path) === 'memory.md',\n  );\n\n  const sections: string[] = [\n    'You are a personal AI assistant running inside xopc.',\n    '',\n    '## Workspace Files (injected)',\n    '',\n    'Profile bootstrap files are injected below as Project Context. Do not manually reread them at session start unless the user asks or injected content is insufficient.',\n    '',\n  ];\n\n  if (!isMinimal) {\n    sections.push(buildTimeSection(userTimezone));\n    sections.push(buildExternalMemorySection(externalMemoryInstructions));\n    sections.push(buildMemorySection(memoryCitationsMode, hasProfileMemory));\n  }\n\n  sections.push(buildSkillsSection(availableTools));\n\n  if (!isMinimal) {\n    sections.push(buildSafetySection());\n    sections.push(buildProblemSolvingSection());\n    sections.push(buildAestheticSection());\n  }\n\n  sections.push(\n    ...buildProjectContextSection({\n      files: stableContextFiles,\n      heading: '# Project Context',\n      dynamic: false,\n    }),\n  );\n\n  sections.push(PROMPT_CACHE_BOUNDARY);\n\n  sections.push(\n    ...buildProjectContextSection({\n      files: dynamicContextFiles,\n      heading: stableContextFiles.length > 0 ? '# Dynamic Project Context' : '# Project Context',\n      dynamic: true,\n    }),\n  );\n\n  sections.push(buildHeartbeatBehaviorSection({ enabled: heartbeatEnabled, customPrompt: heartbeatPrompt, userTimezone }));\n  sections.push(buildWorkingDirSection(workspaceDir));\n  sections.push(buildMessagingSection(channels, isMinimal));\n\n  if (!isMinimal && ttsSystemHint?.trim()) {\n    sections.push(`## Voice (TTS)\\n\\n${ttsSystemHint.trim()}`);\n  }\n\n  sections.push(buildRuntimeSection(runtime));\n\n  return sections.filter(Boolean).join('\\n\\n');\n}\n\n/** Whether HEARTBEAT.md is injected as dynamic context (vs behavior-only section). */\nexport function isHeartbeatContextFile(pathValue: string): boolean {\n  return getContextFileBasename(pathValue) === DEFAULT_HEARTBEAT_FILENAME.toLowerCase();\n}\n"],"mappings":"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"}
+{"version":3,"file":"system-prompt.js","names":[],"sources":["../../../../src/agent/prompt/system-prompt.ts"],"sourcesContent":["/**\n * System Prompt Builder — xopc-owned prompt with OpenClaw-style bootstrap injection.\n *\n * Profile Markdown under `agents/<id>/profile/` is injected as Project Context\n * (see `src/agent/bootstrap/`). Runtime owns loading; AGENTS.md instructs agents\n * not to manually reread startup files.\n */\n\nimport type { EmbeddedContextFile } from '../bootstrap/types.js';\nimport { PROMPT_CACHE_BOUNDARY, splitPromptCacheBoundary } from './cache-boundary.js';\nimport type { ProviderSystemPromptContribution } from './contribution.js';\nimport {\n  buildAestheticSection,\n  buildExecutionBiasSection,\n  buildProblemSolvingSection,\n  buildSafetySection,\n  buildToolCallStyleSection,\n} from './sections/behavior.js';\nimport {\n  buildExternalMemorySection,\n  buildMemorySection,\n  buildSkillsSection,\n} from './sections/memory-skills.js';\nimport {\n  buildHeartbeatBehaviorSection,\n  buildMessagingSection,\n  buildOutputDirectivesSection,\n  buildSilentRepliesSection,\n  buildTimeSection,\n} from './sections/messaging-runtime.js';\nimport {\n  buildProjectContextSection,\n  getContextFileBasename,\n  isDynamicContextFile,\n  sortContextFilesForPrompt,\n} from './sections/project-context.js';\nimport { buildToolingSection, hasSkillsTools } from './sections/tooling.js';\nimport {\n  buildRuntimeSection,\n  buildWorkspaceFilesIntroSection,\n  buildWorkspaceSection,\n  type RuntimeInfoInput,\n} from './sections/workspace-runtime.js';\nimport { buildOverridablePromptSection } from './system-prompt-params.js';\nimport type { MemoryCitationsMode, PromptMode, SilentReplyPromptMode } from './types.js';\n\nexport type { MemoryCitationsMode } from './types.js';\nexport {\n  getContextFileBasename,\n  isDynamicContextFile,\n  sortContextFilesForPrompt,\n} from './sections/project-context.js';\n\nexport interface SystemPromptOptions {\n  contextFiles?: EmbeddedContextFile[];\n  promptMode?: PromptMode;\n  heartbeatEnabled?: boolean;\n  heartbeatPrompt?: string;\n  /** Registered tool names for Tooling section and memory/skills gating. */\n  toolNames?: string[];\n  toolSummaries?: Record<string, string>;\n  /** @deprecated Prefer toolNames — kept for skill-section gating compatibility. */\n  availableTools?: string[];\n  memoryCitationsMode?: MemoryCitationsMode;\n  includeMemorySection?: boolean;\n  userTimezone?: string;\n  runtime?: RuntimeInfoInput;\n  channels?: string[];\n  externalMemoryInstructions?: string;\n  ttsSystemHint?: string;\n  extraSystemPrompt?: string;\n  silentReplyPromptMode?: SilentReplyPromptMode;\n  promptContribution?: ProviderSystemPromptContribution;\n  includeProblemSolving?: boolean;\n  includeToneSection?: boolean;\n}\n\nfunction joinSections(sections: Array<string | undefined>): string {\n  return sections.filter((section): section is string => Boolean(section?.trim())).join('\\n\\n');\n}\n\n/**\n * Build system prompt with bootstrap Project Context integration.\n */\nexport function buildSystemPrompt(workspaceDir: string, options: SystemPromptOptions = {}): string {\n  const {\n    contextFiles = [],\n    promptMode = 'full',\n    heartbeatEnabled = false,\n    heartbeatPrompt,\n    toolNames: toolNamesOption,\n    toolSummaries,\n    availableTools = [],\n    memoryCitationsMode = 'on',\n    includeMemorySection,\n    userTimezone,\n    runtime,\n    channels = [],\n    externalMemoryInstructions,\n    ttsSystemHint,\n    extraSystemPrompt,\n    silentReplyPromptMode = 'generic',\n    promptContribution,\n    includeProblemSolving = true,\n    includeToneSection = true,\n  } = options;\n\n  if (promptMode === 'none') {\n    return 'You are a personal AI assistant running inside xopc.';\n  }\n\n  const isMinimal = promptMode === 'minimal';\n  const toolNames = toolNamesOption ?? availableTools;\n  const normalizedTools = new Set(toolNames.map((tool) => tool.toLowerCase()));\n  const sectionOverrides = promptContribution?.sectionOverrides ?? {};\n\n  const orderedContextFiles = sortContextFilesForPrompt(\n    contextFiles.filter((file) => file.path.trim().length > 0),\n  );\n  const stableContextFiles = orderedContextFiles.filter((file) => !isDynamicContextFile(file.path));\n  const dynamicContextFiles = orderedContextFiles.filter((file) => isDynamicContextFile(file.path));\n  const hasProfileMemory = orderedContextFiles.some(\n    (file) => getContextFileBasename(file.path) === 'memory.md',\n  );\n\n  const stableSections: string[] = [\n    'You are a personal AI assistant running inside xopc.',\n    buildToolingSection({ toolNames, toolSummaries }),\n    buildOverridablePromptSection({\n      override: sectionOverrides.tool_call_style,\n      fallback: buildToolCallStyleSection(),\n    }),\n  ];\n\n  if (!isMinimal) {\n    stableSections.push(\n      buildOverridablePromptSection({\n        override: sectionOverrides.execution_bias,\n        fallback: buildExecutionBiasSection(),\n      }),\n    );\n  }\n\n  const providerStablePrefix = buildOverridablePromptSection({\n    override: promptContribution?.stablePrefix,\n    fallback: '',\n  });\n  if (providerStablePrefix) {\n    stableSections.push(providerStablePrefix);\n  }\n\n  stableSections.push(buildSafetySection());\n\n  if (hasSkillsTools(toolNames)) {\n    stableSections.push(buildSkillsSection(true));\n  }\n\n  if (!isMinimal) {\n    stableSections.push(\n      buildMemorySection({\n        availableTools: normalizedTools,\n        citationsMode: memoryCitationsMode,\n        hasProfileMemory,\n        includeMemorySection,\n      }),\n      buildExternalMemorySection(externalMemoryInstructions),\n    );\n    if (includeProblemSolving) {\n      stableSections.push(buildProblemSolvingSection());\n    }\n    if (includeToneSection) {\n      stableSections.push(buildAestheticSection());\n    }\n    stableSections.push(buildTimeSection(userTimezone));\n  }\n\n  stableSections.push(\n    buildWorkspaceSection(workspaceDir),\n    buildWorkspaceFilesIntroSection(),\n  );\n\n  if (!isMinimal) {\n    stableSections.push(buildOutputDirectivesSection(isMinimal));\n  }\n\n  stableSections.push(\n    buildMessagingSection({\n      channels,\n      isMinimal,\n      hasSendMessage: normalizedTools.has('send_message'),\n    }),\n  );\n\n  if (!isMinimal && ttsSystemHint?.trim()) {\n    stableSections.push(`## Voice (TTS)\\n\\n${ttsSystemHint.trim()}`);\n  }\n\n  stableSections.push(\n    joinSections(\n      buildProjectContextSection({\n        files: stableContextFiles,\n        heading: '# Project Context',\n        dynamic: false,\n      }),\n    ),\n  );\n\n  if (!isMinimal) {\n    stableSections.push(\n      buildSilentRepliesSection({ isMinimal, silentReplyPromptMode }),\n    );\n  }\n\n  const dynamicSections: string[] = [];\n\n  dynamicSections.push(\n    joinSections(\n      buildProjectContextSection({\n        files: dynamicContextFiles,\n        heading: stableContextFiles.length > 0 ? '# Dynamic Project Context' : '# Project Context',\n        dynamic: true,\n      }),\n    ),\n  );\n\n  if (extraSystemPrompt?.trim()) {\n    const contextHeader = isMinimal ? '## Subagent Context' : '## Group Chat Context';\n    dynamicSections.push(`${contextHeader}\\n\\n${extraSystemPrompt.trim()}`);\n  }\n\n  const providerDynamicSuffix = buildOverridablePromptSection({\n    override: promptContribution?.dynamicSuffix,\n    fallback: '',\n  });\n  if (providerDynamicSuffix) {\n    dynamicSections.push(providerDynamicSuffix);\n  }\n\n  dynamicSections.push(\n    buildHeartbeatBehaviorSection({\n      enabled: heartbeatEnabled,\n      customPrompt: heartbeatPrompt,\n      userTimezone,\n    }),\n    buildRuntimeSection(runtime),\n  );\n\n  const stablePrefix = joinSections(stableSections);\n  const dynamicSuffix = joinSections(dynamicSections);\n\n  if (!dynamicSuffix.trim()) {\n    return `${stablePrefix}\\n\\n${PROMPT_CACHE_BOUNDARY}`.trim();\n  }\n\n  return `${stablePrefix}\\n\\n${PROMPT_CACHE_BOUNDARY}\\n\\n${dynamicSuffix}`.trim();\n}\n\n/** Split a built prompt at the cache boundary (for tests and provider adapters). */\nexport function splitBuiltSystemPrompt(text: string) {\n  return splitPromptCacheBoundary(text);\n}\n"],"mappings":";;;;;;;;;AA6EA,SAAS,aAAa,UAA6C;AACjE,QAAO,SAAS,QAAQ,YAA+B,QAAQ,SAAS,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO;;;;;AAM/F,SAAgB,kBAAkB,cAAsB,UAA+B,EAAE,EAAU;CACjG,MAAM,EACJ,eAAe,EAAE,EACjB,aAAa,QACb,mBAAmB,OACnB,iBACA,WAAW,iBACX,eACA,iBAAiB,EAAE,EACnB,sBAAsB,MACtB,sBACA,cACA,SACA,WAAW,EAAE,EACb,4BACA,eACA,mBACA,wBAAwB,WACxB,oBACA,wBAAwB,MACxB,qBAAqB,SACnB;AAEJ,KAAI,eAAe,OACjB,QAAO;CAGT,MAAM,YAAY,eAAe;CACjC,MAAM,YAAY,mBAAmB;CACrC,MAAM,kBAAkB,IAAI,IAAI,UAAU,KAAK,SAAS,KAAK,aAAa,CAAC,CAAC;CAC5E,MAAM,mBAAmB,oBAAoB,oBAAoB,EAAE;CAEnE,MAAM,sBAAsB,0BAC1B,aAAa,QAAQ,SAAS,KAAK,KAAK,MAAM,CAAC,SAAS,EAAE,CAC3D;CACD,MAAM,qBAAqB,oBAAoB,QAAQ,SAAS,CAAC,qBAAqB,KAAK,KAAK,CAAC;CACjG,MAAM,sBAAsB,oBAAoB,QAAQ,SAAS,qBAAqB,KAAK,KAAK,CAAC;CACjG,MAAM,mBAAmB,oBAAoB,MAC1C,SAAS,uBAAuB,KAAK,KAAK,KAAK,YACjD;CAED,MAAM,iBAA2B;EAC/B;EACA,oBAAoB;GAAE;GAAW;GAAe,CAAC;EACjD,8BAA8B;GAC5B,UAAU,iBAAiB;GAC3B,UAAU,2BAA2B;GACtC,CAAC;EACH;AAED,KAAI,CAAC,UACH,gBAAe,KACb,8BAA8B;EAC5B,UAAU,iBAAiB;EAC3B,UAAU,2BAA2B;EACtC,CAAC,CACH;CAGH,MAAM,uBAAuB,8BAA8B;EACzD,UAAU,oBAAoB;EAC9B,UAAU;EACX,CAAC;AACF,KAAI,qBACF,gBAAe,KAAK,qBAAqB;AAG3C,gBAAe,KAAK,oBAAoB,CAAC;AAEzC,KAAI,eAAe,UAAU,CAC3B,gBAAe,KAAK,mBAAmB,KAAK,CAAC;AAG/C,KAAI,CAAC,WAAW;AACd,iBAAe,KACb,mBAAmB;GACjB,gBAAgB;GAChB,eAAe;GACf;GACA;GACD,CAAC,EACF,2BAA2B,2BAA2B,CACvD;AACD,MAAI,sBACF,gBAAe,KAAK,4BAA4B,CAAC;AAEnD,MAAI,mBACF,gBAAe,KAAK,uBAAuB,CAAC;AAE9C,iBAAe,KAAK,iBAAiB,aAAa,CAAC;;AAGrD,gBAAe,KACb,sBAAsB,aAAa,EACnC,iCAAiC,CAClC;AAED,KAAI,CAAC,UACH,gBAAe,KAAK,6BAA6B,UAAU,CAAC;AAG9D,gBAAe,KACb,sBAAsB;EACpB;EACA;EACA,gBAAgB,gBAAgB,IAAI,eAAe;EACpD,CAAC,CACH;AAED,KAAI,CAAC,aAAa,eAAe,MAAM,CACrC,gBAAe,KAAK,qBAAqB,cAAc,MAAM,GAAG;AAGlE,gBAAe,KACb,aACE,2BAA2B;EACzB,OAAO;EACP,SAAS;EACT,SAAS;EACV,CAAC,CACH,CACF;AAED,KAAI,CAAC,UACH,gBAAe,KACb,0BAA0B;EAAE;EAAW;EAAuB,CAAC,CAChE;CAGH,MAAM,kBAA4B,EAAE;AAEpC,iBAAgB,KACd,aACE,2BAA2B;EACzB,OAAO;EACP,SAAS,mBAAmB,SAAS,IAAI,8BAA8B;EACvE,SAAS;EACV,CAAC,CACH,CACF;AAED,KAAI,mBAAmB,MAAM,EAAE;EAC7B,MAAM,gBAAgB,YAAY,wBAAwB;AAC1D,kBAAgB,KAAK,GAAG,cAAc,MAAM,kBAAkB,MAAM,GAAG;;CAGzE,MAAM,wBAAwB,8BAA8B;EAC1D,UAAU,oBAAoB;EAC9B,UAAU;EACX,CAAC;AACF,KAAI,sBACF,iBAAgB,KAAK,sBAAsB;AAG7C,iBAAgB,KACd,8BAA8B;EAC5B,SAAS;EACT,cAAc;EACd;EACD,CAAC,EACF,oBAAoB,QAAQ,CAC7B;CAED,MAAM,eAAe,aAAa,eAAe;CACjD,MAAM,gBAAgB,aAAa,gBAAgB;AAEnD,KAAI,CAAC,cAAc,MAAM,CACvB,QAAO,GAAG,aAAa,MAAM,wBAAwB,MAAM;AAG7D,QAAO,GAAG,aAAa,MAAM,sBAAsB,MAAM,gBAAgB,MAAM;;;AAIjF,SAAgB,uBAAuB,MAAc;AACnD,QAAO,yBAAyB,KAAK"}

package/dist/src/agent/prompt/types.d.ts

@@ -6,3 +6,6 @@
  * - "none": Just basic identity line, no sections
  */
 export type PromptMode = 'full' | 'minimal' | 'none';
+/** Controls the generic silent-reply section. Channel-aware callers can set "none". */
+export type SilentReplyPromptMode = 'generic' | 'none';
+export type MemoryCitationsMode = 'on' | 'off' | 'source-only';

package/dist/src/agent/service/build-direct-message-content.d.ts

@@ -1,30 +1,14 @@
 import type { Config } from '../../config/schema.js';
+import type { MediaRef } from '../../channels/attachments/inbound-persist.js';
 import type { AgentInstanceGateway } from '../agent-instance-gateway.js';
 import type { ModelManager } from '../models/index.js';
-export type DirectInboundAttachment = {
-    type: string;
-    mimeType?: string;
-    data?: string;
-    name?: string;
-    size?: number;
-    workspaceRelativePath?: string;
-};
-export type DirectMessagePart = {
-    type: 'text';
-    text: string;
-} | {
-    type: 'image';
-    data: string;
-    mimeType: string;
-};
-/**
- * Build user message parts (text + resolved images/files) for direct / webchat turns.
- */
+export type { InboundAttachmentInput as DirectInboundWireAttachment } from '../../channels/attachments/inbound-persist.js';
+export type { MediaRef as DirectInboundAttachment } from '../../channels/attachments/inbound-persist.js';
 export declare function buildDirectUserMessageContent(opts: {
     content: string;
-    attachments?: DirectInboundAttachment[];
+    attachments?: MediaRef[];
     sessionKey?: string;
     config: Config;
     agentManager: AgentInstanceGateway;
     modelManager: ModelManager;
-}): Promise<DirectMessagePart[]>;
+}): Promise<import("../inbound/attachment-pipeline.js").TranscriptUserMessage>;

package/dist/src/agent/service/build-direct-message-content.js

@@ -1,73 +1,20 @@
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
-import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "../agent-scope.js";
-import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { getDefaultModelSync, init_providers } from "../../providers/index.js";
-import { formatInboundFileTextBlock } from "../../channels/attachments/inbound-persist.js";
-import { expandAtFileMentionsInPlainText } from "../context/expand-at-file-mentions.js";
-import { resolveInboundImageContentParts } from "../image/inbound-image-handling.js";
+import { buildTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
 //#region src/agent/service/build-direct-message-content.ts
 init_schema();
 init_providers();
-init_agent_scope();
-/**
-* Build user message parts (text + resolved images/files) for direct / webchat turns.
-*/
 async function buildDirectUserMessageContent(opts) {
-	const { content, attachments, sessionKey, config, agentManager, modelManager } = opts;
-	const messageContent = [];
-	const sk = sessionKey ?? "";
-	if (content.trim()) {
-		let textPart = content;
-		if (/@file:/.test(textPart)) {
-			const wsKey = sk !== "" ? sk : "agent:main:main";
-			const root = agentManager.getResolvedWorkspaceForSession(wsKey);
-			textPart = await expandAtFileMentionsInPlainText(textPart, root);
-		}
-		messageContent.push({
-			type: "text",
-			text: textPart
-		});
-	}
-	if (!attachments?.length) return messageContent;
-	const modelRef = sk !== "" ? modelManager.getModelForSession(sk) : getAgentDefaultModelRef(config) ?? getDefaultModelSync(config);
-	const storageRoot = sk !== "" ? resolveAgentHomeDir(config, extractProfileAgentId(sk, config)) : resolveAgentHomeDir(config, resolveDefaultAgentId(config));
-	let i = 0;
-	while (i < attachments.length) {
-		const att = attachments[i];
-		if (att.type === "image" || att.type === "photo" || Boolean(att.mimeType?.startsWith("image/"))) {
-			const group = [];
-			while (i < attachments.length) {
-				const a = attachments[i];
-				if (!(a.type === "image" || a.type === "photo" || Boolean(a.mimeType?.startsWith("image/")))) break;
-				if (!a.data || a.data.length === 0) {
-					i += 1;
-					continue;
-				}
-				group.push({
-					data: a.data,
-					mimeType: a.mimeType || "image/png"
-				});
-				i += 1;
-			}
-			if (group.length > 0) {
-				const parts = await resolveInboundImageContentParts({
-					modelRef: modelRef || getDefaultModelSync(config),
-					cfg: config,
-					userTextForContext: content.trim() ? content : "",
-					images: group
-				});
-				messageContent.push(...parts);
-			}
-		} else {
-			const fileBlock = formatInboundFileTextBlock(att, storageRoot);
-			messageContent.push({
-				type: "text",
-				text: fileBlock
-			});
-			i += 1;
-		}
-	}
-	return messageContent;
+	const sk = opts.sessionKey ?? "";
+	const modelRef = sk !== "" ? opts.modelManager.getModelForSession(sk) : getAgentDefaultModelRef(opts.config) ?? getDefaultModelSync(opts.config);
+	return buildTranscriptUserMessage({
+		text: opts.content,
+		prepared: opts.attachments,
+		sessionKey: sk,
+		modelRef: modelRef || getDefaultModelSync(opts.config),
+		config: opts.config,
+		agentManager: opts.agentManager
+	});
 }
 //#endregion
 export { buildDirectUserMessageContent };