@xopcai/xopc 0.0.29 → 0.0.31

package/dist/src/agent/service.js

@@ -1,42 +1,27 @@
 import { init_agent_scope, resolveAgentBootstrapDir, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { applyConfigOverrides } from "../config/runtime-overrides.js";
-import { init_session_key, parseSessionKey } from "../routing/session-key.js";
 import { extractProfileAgentId, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { runWithLogContext, updateAsyncLogContext } from "../utils/logger/context.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { extractTextContent, loadBootstrapFiles } from "./context/workspace.js";
-import { isTTSAvailable } from "../voice/tts/factory.js";
-import { mergeTtsConfigFromAppConfig } from "../voice/tts/merge-config.js";
-import { DREAMING_CRON_NAME, DREAMING_LIGHT_CRON_NAME, DREAMING_LIGHT_SWEEP_TOKEN, DREAMING_REM_CRON_NAME, DREAMING_REM_SWEEP_TOKEN, DREAMING_SWEEP_TOKEN } from "./memory/dreaming/constants.js";
-import { resolveDreamingConfig } from "./memory/dreaming/config.js";
-import { speak } from "../voice/tts/speak-core.js";
-import { getChannelOutputFormat, shouldUseTTS } from "../voice/tts/service.js";
-import { compressAudio } from "../voice/tts/audio.js";
-import { extractAgentUserPlainText } from "./memory/user-message-text.js";
 import { AgentManager } from "./agent-manager.js";
 import { MessageBusShutdownError } from "../infra/bus/queue.js";
 import "../infra/bus/index.js";
-import { formatInboundFileTextBlock, persistInboundAttachmentsToWorkspace } from "../channels/attachments/inbound-persist.js";
+import { persistInboundAttachmentsToWorkspace } from "../channels/attachments/inbound-persist.js";
 import { maybeAutoTitleSessionStore } from "../session/session-title.js";
-import { INTERNAL_OUTBOUND_DROP_CHANNEL } from "../channels/internal-outbound.js";
-import { cleanTrailingErrors, sanitizeMessages } from "./memory/message-sanitizer.js";
 import { SessionStore } from "../session/store.js";
 import { SessionConfigStore } from "../session/config-store.js";
 import { normalizeReasoningLevel, normalizeThinkLevel } from "./transcript/thinking-types.js";
 import { resolveEffectiveReasoningLevel, resolveEffectiveThinkingLevel } from "../session/thinking-resolve.js";
 import { effectiveWorkspacePathForSession, normalizeWorkingDirectoryInput } from "../session/session-workspace.js";
 import "../session/index.js";
-import { parseSlashCommand } from "../chat-commands/command-parse.js";
-import { commandRegistry } from "../chat-commands/registry.js";
 import { ExtensionHookRunner } from "../extensions/hooks.js";
 import "../extensions/index.js";
 import { SessionTracker } from "./session/tracker.js";
 import { ModelManager } from "./models/manager.js";
 import "./models/index.js";
-import "../voice/tts/index.js";
 import { initializeCommands } from "../chat-commands/index.js";
 import { ProgressFeedbackManager } from "./lifecycle/progress.js";
 import { HookHandler } from "./lifecycle/hook-handler.js";
@@ -59,10 +44,8 @@ import "./messaging/index.js";
 import { SessionContextManager } from "./session/session-context.js";
 import { SessionLifecycleManager } from "./session/session-lifecycle.js";
 import "./session/index.js";
+import { cleanTrailingErrors, sanitizeMessages } from "./memory/message-sanitizer.js";
 import { tryApplySessionTranscriptHygiene, tryApplySessionTranscriptHygieneForPersistence } from "./transcript/transcript-hygiene.js";
-import { runAgentTurnWithModelFallbacks } from "./orchestration/run-agent-turn-with-fallbacks.js";
-import { expandAtFileMentionsInPlainText } from "./context/expand-at-file-mentions.js";
-import { resolveInboundImageContentParts } from "./image/inbound-image-handling.js";
 import { AgentOrchestrator } from "./orchestration/agent-orchestrator.js";
 import { AgentEventHandler } from "./orchestration/agent-event-handler.js";
 import "./orchestration/index.js";
@@ -70,19 +53,22 @@ import { FeedbackCoordinator } from "./feedback/feedback-coordinator.js";
 import "./feedback/index.js";
 import { inboundMessageLogRequestId } from "./service-inbound-utils.js";
 import { runProcessDirectStreaming } from "./service/process-direct-streaming.js";
+import { reconcileManagedDreamingCronJobs } from "./service/reconcile-dreaming-cron.js";
+import { parseOutboundSessionKey } from "./service/parse-outbound-session-key.js";
+import { runBtwQuery } from "./service/btw-query.js";
+import { formatSessionContextReport } from "./service/session-context-report.js";
+import { buildDirectUserMessageContent } from "./service/build-direct-message-content.js";
+import { maybeEmitWebchatTts } from "./service/webchat-tts.js";
+import { runProcessDirect } from "./service/process-direct-one-shot.js";
 import { shouldSilence } from "../heartbeat/tokens.js";
 import { createTypingController } from "./lifecycle/typing.js";
-import { persistOutboundTtsAudio } from "../channels/attachments/outbound-tts-persist.js";
 import { join } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
-import { complete } from "@mariozechner/pi-ai";
 import { mkdir } from "node:fs/promises";
 //#region src/agent/service.ts
 init_schema();
 init_logger();
 init_agent_scope();
-init_session_key();
-init_providers();
 const log = createLogger("AgentService");
 var AgentService = class {
 	sessionStore;
@@ -354,11 +340,11 @@ var AgentService = class {
 		this.agentManager.updateAgentDefaults(config);
 		this.commandHandler.updateAgentConfig(config);
 	}
-	getSkillCatalog() {
-		return this.agentManager.getSkillCatalog();
+	getSkillCatalog(lang) {
+		return this.agentManager.getSkillCatalog(lang);
 	}
-	getSkillMarkdownSource(skillName) {
-		return this.agentManager.getSkillMarkdownSource(skillName);
+	getSkillMarkdownSource(skillName, lang) {
+		return this.agentManager.getSkillMarkdownSource(skillName, lang);
 	}
 	refreshSkillsAfterDiskChange() {
 		this.agentManager.refreshSkillsAfterDiskChange();
@@ -468,64 +454,7 @@ var AgentService = class {
 	async reconcileDreamingCronJob() {
 		const cron = this.config.getCronService?.();
 		if (!cron) return;
-		const dreaming = resolveDreamingConfig(this.effectiveAppConfig());
-		const managed = (await cron.listJobs()).filter((job) => job.name?.includes?.("[managed-by=xopc.memory.dreaming]") ?? false);
-		const phaseSpecs = [
-			{
-				cronName: DREAMING_LIGHT_CRON_NAME,
-				token: DREAMING_LIGHT_SWEEP_TOKEN,
-				schedule: dreaming.phases.light.cron,
-				phaseEnabled: dreaming.phases.light.enabled
-			},
-			{
-				cronName: DREAMING_CRON_NAME,
-				token: DREAMING_SWEEP_TOKEN,
-				schedule: dreaming.phases.deep.cron,
-				phaseEnabled: dreaming.phases.deep.enabled
-			},
-			{
-				cronName: DREAMING_REM_CRON_NAME,
-				token: DREAMING_REM_SWEEP_TOKEN,
-				schedule: dreaming.phases.rem.cron,
-				phaseEnabled: dreaming.phases.rem.enabled
-			}
-		];
-		if (!dreaming.enabled) {
-			for (const job of managed) await cron.removeJob(job.id).catch(() => {});
-			return;
-		}
-		for (const spec of phaseSpecs) {
-			const phaseJobs = managed.filter((job) => job.name === spec.cronName);
-			if (!spec.phaseEnabled) {
-				for (const job of phaseJobs) await cron.removeJob(job.id).catch(() => {});
-				continue;
-			}
-			const desiredPayload = {
-				kind: "agentTurn",
-				message: spec.token
-			};
-			if (phaseJobs.length === 0) {
-				await cron.addJob(spec.schedule, {
-					name: spec.cronName,
-					timezone: dreaming.timezone,
-					sessionTarget: "isolated",
-					payload: desiredPayload,
-					enabled: true
-				});
-				continue;
-			}
-			const primary = phaseJobs[0];
-			for (const dup of phaseJobs.slice(1)) await cron.removeJob(dup.id).catch(() => {});
-			const payloadMessage = primary.payload?.kind === "agentTurn" ? primary.payload.message : primary.payload?.text;
-			if (primary.schedule !== spec.schedule || (dreaming.timezone ?? null) !== (primary.timezone ?? null) || primary.sessionTarget !== "isolated" || payloadMessage !== spec.token || primary.enabled !== true || primary.name !== spec.cronName) await cron.updateJob(primary.id, {
-				schedule: spec.schedule,
-				timezone: dreaming.timezone ?? void 0,
-				sessionTarget: "isolated",
-				name: spec.cronName,
-				payload: desiredPayload,
-				enabled: true
-			});
-		}
+		await reconcileManagedDreamingCronJobs(cron, this.effectiveAppConfig());
 	}
 	/**
 	* Persist agent messages with the same sanitizer + transcript hygiene as AgentOrchestrator.
@@ -583,34 +512,7 @@ var AgentService = class {
 		return out;
 	}
 	parseSessionKey(sessionKey) {
-		const parts = sessionKey.split(":").filter(Boolean);
-		const first = parts[0] || "cli";
-		if (first === "heartbeat") {
-			const hb = this.config.config?.gateway?.heartbeat;
-			const target = hb?.target?.trim();
-			const targetChatId = hb?.targetChatId?.trim();
-			if (target && targetChatId) return {
-				channel: target,
-				chatId: targetChatId
-			};
-			return {
-				channel: INTERNAL_OUTBOUND_DROP_CHANNEL,
-				chatId: parts.slice(1).join(":") || "heartbeat"
-			};
-		}
-		const parsed = parseSessionKey(sessionKey);
-		if (parsed) return {
-			channel: parsed.source,
-			chatId: parsed.peerId
-		};
-		if (first === "cron") return {
-			channel: INTERNAL_OUTBOUND_DROP_CHANNEL,
-			chatId: parts.slice(1).join(":") || "cron"
-		};
-		return {
-			channel: first,
-			chatId: parts.slice(1).join(":") || "direct"
-		};
+		return parseOutboundSessionKey(sessionKey, this.config.config);
 	}
 	initSessionContext(sessionKey, channel, chatId, senderId = "") {
 		const context = {
@@ -631,63 +533,6 @@ var AgentService = class {
 		this.setupSessionEventHandling(sessionKey);
 		return context;
 	}
-	async buildMessageContent(content, attachments, sessionKey) {
-		const messageContent = [];
-		const sk = sessionKey ?? "";
-		if (content.trim()) {
-			let textPart = content;
-			if (/@file:/.test(textPart)) {
-				const wsKey = sk !== "" ? sk : "cli:direct";
-				const root = this.agentManager.getResolvedWorkspaceForSession(wsKey);
-				textPart = await expandAtFileMentionsInPlainText(textPart, root);
-			}
-			messageContent.push({
-				type: "text",
-				text: textPart
-			});
-		}
-		if (!attachments?.length) return messageContent;
-		const modelRef = sk !== "" ? this.modelManager.getModelForSession(sk) : getAgentDefaultModelRef(this.config.config) ?? getDefaultModelSync(this.config.config);
-		const cfg = this.config.config;
-		const storageRoot = sk !== "" ? resolveAgentHomeDir(this.config.config, extractProfileAgentId(sk, this.config.config)) : resolveAgentHomeDir(this.config.config, resolveDefaultAgentId(this.config.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(cfg),
-						cfg,
-						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;
-	}
 	/**
 	* Persist inbound file attachments under agent home `inbound/` (non-images with data).
 	* Idempotent if `workspaceRelativePath` is already set on an attachment.
@@ -720,86 +565,22 @@ var AgentService = class {
 		return result;
 	}
 	/**
+	* Drop in-memory agent so the next turn reloads transcript from disk (e.g. after checkpoint restore).
+	*/
+	evictSessionAgent(sessionKey) {
+		this.agentManager.removeAgent(sessionKey);
+	}
+	/**
 	* One-shot LLM answer for /btw: uses transcript as background only; does not persist to session.
 	*/
 	async btwQuery(sessionKey, question) {
-		const q = question.trim();
-		if (!q) return {
-			text: "",
-			error: "Empty question."
-		};
-		const messages = await this.sessionStore.load(sessionKey);
-		const modelRef = this.modelManager.getModelForSession(sessionKey);
-		let model;
-		try {
-			model = resolveModel(modelRef);
-		} catch (err) {
-			const em = err instanceof Error ? err.message : String(err);
-			log.warn({
-				err,
-				modelRef,
-				errorMessage: em
-			}, "btwQuery: model resolve failed");
-			return {
-				text: "",
-				error: `Could not resolve model: ${modelRef}`
-			};
-		}
-		const background = this.formatMessagesForBtw(messages.slice(-40));
-		const userMessage = {
-			role: "user",
-			content: [
-				[
-					"You are answering an ephemeral /btw side question about the current conversation.",
-					"Use the conversation only as background context.",
-					"Answer only the side question. Do not continue or complete any unfinished task from the conversation.",
-					"Do not use tools, shell, or file writes unless the question explicitly requires a tiny code snippet.",
-					"If the question can be answered briefly, answer briefly."
-				].join("\n"),
-				"",
-				"---",
-				"Conversation background (read-only):",
-				background || "(empty)",
-				"",
-				"---",
-				"Side question:",
-				q
-			].join("\n"),
-			timestamp: Date.now()
-		};
-		const controller = new AbortController();
-		const timeoutId = setTimeout(() => controller.abort(), 9e4);
-		try {
-			const out = await complete(model, { messages: [userMessage] }, {
-				maxTokens: 2048,
-				temperature: .4,
-				signal: controller.signal
-			});
-			return { text: (Array.isArray(out.content) ? out.content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text || "").join("") : "").trim() };
-		} catch (err) {
-			const em = err instanceof Error ? err.message : String(err);
-			log.warn({
-				err,
-				sessionKey,
-				errorMessage: em
-			}, "btwQuery failed");
-			return {
-				text: "",
-				error: em
-			};
-		} finally {
-			clearTimeout(timeoutId);
-		}
-	}
-	formatMessagesForBtw(messages) {
-		return messages.map((m) => {
-			const role = m.role;
-			let body = "";
-			if (typeof m.content === "string") body = m.content;
-			else if (Array.isArray(m.content)) body = m.content.filter((c) => c.type === "text").map((c) => c.text || "").join("\n");
-			const line = `[${role}]: ${body}`;
-			return line.length > 4e3 ? `${line.slice(0, 4e3)}…` : line;
-		}).join("\n\n");
+		return runBtwQuery({
+			sessionKey,
+			question,
+			sessionStore: this.sessionStore,
+			modelForSession: this.modelManager.getModelForSession(sessionKey),
+			log
+		});
 	}
 	/** Markdown or JSON summary for /context (prompt assembly is approximated from config + transcript stats). */
 	async getSessionContextReport(sessionKey, mode) {
@@ -815,45 +596,23 @@ var AgentService = class {
 		const compaction = defaults?.compaction;
 		const tools = defaults?.tools;
 		const toolsSummary = tools && typeof tools === "object" ? Object.entries(tools).filter(([, v]) => v === true).map(([k]) => k).slice(0, 16).join(", ") || "(none explicitly true)" : "(see agents.defaults.tools in config)";
-		const payload = {
+		return formatSessionContextReport({
 			sessionKey,
+			mode,
 			model,
 			workspacePath: workspace,
 			agentId: profile.agentId,
 			messageCount: messages.length,
 			contextWindowNominal: cw,
 			estimatedTranscriptTokens: estTokens,
-			approxWindowUsage: cw > 0 ? estTokens / cw : null,
 			thinkingDefault: defaults?.thinkingDefault,
 			reasoningDefault: defaults?.reasoningDefault,
 			verboseDefault: defaults?.verboseDefault,
 			compaction,
-			toolsFlagsOn: toolsSummary,
+			toolsFlagsSummary: toolsSummary,
 			windowStats: stats.windowStats,
 			compactionRunStats: stats.compactionStats
-		};
-		if (mode === "json") return JSON.stringify(payload, null, 2);
-		const lines = [
-			"📎 *Context overview*",
-			"",
-			`• Session: \`${sessionKey}\``,
-			`• Model: \`${model}\``,
-			`• Agent profile: \`${profile.agentId}\``,
-			`• Workspace: \`${workspace}\``,
-			`• Messages: ${messages.length}`,
-			`• Est. transcript tokens (rough): ${estTokens}`,
-			`• Nominal context budget (4× maxTokens): ${cw}`
-		];
-		if (cw > 0) lines.push(`• Approx. usage vs budget: ${(estTokens / cw * 100).toFixed(1)}%`);
-		lines.push(`• Thinking / reasoning / verbose defaults: ${defaults?.thinkingDefault ?? "—"} / ${defaults?.reasoningDefault ?? "—"} / ${defaults?.verboseDefault ?? "—"}`, `• Tools (true flags): ${toolsSummary}`, "", "_Full system prompt, skills, and memory blocks are assembled at agent runtime; use Web settings or logs for deep inspection._");
-		if (mode === "detail") {
-			lines.push("", "*Compaction config (agents.defaults.compaction):*", "```json");
-			lines.push(JSON.stringify(compaction ?? {}, null, 2));
-			lines.push("```", "", "*Window stats:*", "```json");
-			lines.push(JSON.stringify(stats.windowStats ?? {}, null, 2));
-			lines.push("```");
-		}
-		return lines.join("\n");
+		});
 	}
 	getSessionStats(sessionKey, messages) {
 		return {
@@ -1067,9 +826,21 @@ var AgentService = class {
 			agentOrchestrator: this.agentOrchestrator,
 			commandHandler: this.commandHandler,
 			prepareInboundAttachments: (sk, att) => this.prepareInboundAttachments(sk, att),
-			buildMessageContent: (text, prepared, sk) => this.buildMessageContent(text, prepared, sk),
+			buildMessageContent: (text, prepared, sk) => buildDirectUserMessageContent({
+				content: text,
+				attachments: prepared,
+				sessionKey: sk,
+				config: this.config.config,
+				agentManager: this.agentManager,
+				modelManager: this.modelManager
+			}),
 			persistAgentSessionMessages: (sk) => this.persistAgentSessionMessages(sk),
-			maybeEmitWebchatTts: (sk, hadVoice) => this.maybeEmitWebchatTts(sk, hadVoice),
+			maybeEmitWebchatTts: (sk, hadVoice) => maybeEmitWebchatTts({
+				config: this.config.config,
+				agentManager: this.agentManager,
+				sessionStore: this.sessionStore,
+				log
+			}, sk, hadVoice),
 			endDirectRequestContext: () => this.endDirectRequestContext()
 		};
 	}
@@ -1108,112 +879,36 @@ var AgentService = class {
 			return false;
 		}
 	}
-	/**
-	* Generate TTS for webchat when config allows, persist under agent home `tts/`, attach to last assistant turn.
-	*/
-	async maybeEmitWebchatTts(sessionKey, hadInboundVoice) {
-		const ttsConfig = mergeTtsConfigFromAppConfig(this.config.config?.tts);
-		if (!isTTSAvailable(ttsConfig)) return null;
-		if (!shouldUseTTS(ttsConfig, hadInboundVoice).useTTS) return null;
-		const text = this.agentManager.getLastAssistantContent(sessionKey)?.trim();
-		if (!text) return null;
-		try {
-			const webOut = getChannelOutputFormat("webchat");
-			const fmt = webOut.format;
-			const ttsResult = await speak(text, ttsConfig, {
-				appConfig: this.config.config,
-				tts: { format: fmt }
-			});
-			const { buffer, format } = await compressAudio(Buffer.from(ttsResult.audio), ttsResult.format, webOut.format === "mp3" ? "mp3" : "opus");
-			const normalizedMime = format === "opus" || format === "ogg" ? "audio/ogg" : format === "mp3" || format === "mpeg" ? "audio/mpeg" : format === "wav" ? "audio/wav" : `audio/${format}`;
-			const persisted = await persistOutboundTtsAudio(resolveAgentHomeDir(this.config.config, extractProfileAgentId(sessionKey, this.config.config)), sessionKey, buffer, format);
-			await this.appendAttachmentToLastAssistant(sessionKey, {
-				type: "audio",
-				mimeType: normalizedMime,
-				name: persisted.name,
-				size: persisted.size,
-				workspaceRelativePath: persisted.workspaceRelativePath
-			});
-			return {
-				type: "tts_audio",
-				workspaceRelativePath: persisted.workspaceRelativePath,
-				mimeType: normalizedMime,
-				name: persisted.name
-			};
-		} catch (err) {
-			log.warn({
-				err,
-				sessionKey
-			}, "Webchat TTS failed");
-			return null;
-		}
-	}
-	async appendAttachmentToLastAssistant(sessionKey, att) {
-		const loaded = await this.sessionStore.load(sessionKey);
-		for (let i = loaded.length - 1; i >= 0; i--) {
-			const m = loaded[i];
-			if (m.role === "assistant") {
-				const prev = m.attachments ?? [];
-				if (prev.some((x) => x.workspaceRelativePath === att.workspaceRelativePath)) return;
-				const next = [...prev, att];
-				loaded[i] = {
-					...m,
-					attachments: next
-				};
-				await this.sessionStore.save(sessionKey, loaded);
-				return;
-			}
-		}
+	createRunProcessDirectDeps() {
+		const cfg = this.config.config;
+		if (!cfg) throw new Error("AgentService requires config.config");
+		return {
+			log,
+			config: cfg,
+			parseSessionKey: (sk) => this.parseSessionKey(sk),
+			initSessionContext: (sk, channel, chatId) => {
+				this.initSessionContext(sk, channel, chatId);
+			},
+			hydrateSessionWorkspaceFromStore: (sk) => this.hydrateSessionWorkspaceFromStore(sk),
+			hydrateSessionModelFromStore: (sk) => this.hydrateSessionModelFromStore(sk),
+			agentManager: this.agentManager,
+			sessionStore: this.sessionStore,
+			prepareLoadedSessionMessages: (sk, msgs) => this.prepareLoadedSessionMessages(sk, msgs),
+			modelManager: this.modelManager,
+			applyResolvedThinkingLevel: (sk, t) => this.applyResolvedThinkingLevel(sk, t),
+			prepareInboundAttachments: (sk, att) => this.prepareInboundAttachments(sk, att),
+			commandHandler: this.commandHandler,
+			persistAgentSessionMessages: (sk) => this.persistAgentSessionMessages(sk),
+			endDirectRequestContext: () => this.endDirectRequestContext()
+		};
 	}
 	async processDirect(content, sessionKey = "cli:direct", attachments, thinking) {
-		const { channel, chatId } = this.parseSessionKey(sessionKey);
-		this.initSessionContext(sessionKey, channel, chatId);
-		try {
-			await this.hydrateSessionWorkspaceFromStore(sessionKey);
-			const agent = this.agentManager.getOrCreateAgent(sessionKey);
-			await this.hydrateSessionModelFromStore(sessionKey);
-			const loaded = await this.sessionStore.load(sessionKey);
-			agent.state.messages = this.prepareLoadedSessionMessages(sessionKey, loaded);
-			await this.modelManager.applyModelForSession(agent, sessionKey);
-			await this.applyResolvedThinkingLevel(sessionKey, thinking);
-			const prepared = await this.prepareInboundAttachments(sessionKey, attachments);
-			const cmd = parseSlashCommand(content);
-			if (cmd && commandRegistry.has(cmd.command)) {
-				const { aggregatedText } = await this.commandHandler.executeCommandAndAggregateReply(cmd.command, cmd.args, {
-					sessionKey,
-					channel,
-					chatId,
-					senderId: "",
-					isGroup: false
-				});
-				await this.persistAgentSessionMessages(sessionKey);
-				return aggregatedText;
-			}
-			const textForDirect = content.trimStart().startsWith("/skill:") ? this.agentManager.expandSkillUserText(content) : content;
-			const userMessage = {
-				role: "user",
-				content: await this.buildMessageContent(textForDirect, prepared, sessionKey),
-				timestamp: Date.now()
-			};
-			const userPlain = extractAgentUserPlainText(userMessage);
-			const userMessageForModel = await this.agentManager.applyMemoryPrefetchToUserMessage(userMessage, sessionKey);
-			await runAgentTurnWithModelFallbacks({
-				agent,
-				sessionKey,
-				modelManager: this.modelManager,
-				userMessage: userMessageForModel,
-				log,
-				getConfig: () => this.config.config,
-				beforeUserPrompt: () => this.agentManager.beginBackgroundReviewUserTurn(sessionKey)
-			});
-			this.agentManager.afterAgentTurn(sessionKey, userPlain);
-			this.agentManager.scheduleBackgroundReviewAfterUserTurn(sessionKey);
-			const response = this.agentManager.getLastAssistantContent(sessionKey) || "";
-			await this.persistAgentSessionMessages(sessionKey);
-			return response;
-		} finally {
-			this.endDirectRequestContext();
-		}
+		return runProcessDirect(this.createRunProcessDirectDeps(), {
+			content,
+			sessionKey,
+			attachments,
+			thinking
+		});
 	}
 	async handleInboundMessage(msg) {
 		await runWithLogContext({ requestId: inboundMessageLogRequestId(msg) }, async () => {